diff --git a/Jenkinsfile b/Jenkinsfile
index e870815f..88c55385 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,13 +5,13 @@ pipeline {
   
 	tools {
 		maven 'apache-maven-latest'
-		jdk 'openjdk-jdk11-latest'
+		jdk 'openjdk-jdk17-latest'
 	}
   
 	environment {
 		BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '')
 		CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/capella"
-		CAPELLA_BRANCH = '6.x'
+		CAPELLA_BRANCH = 'master'
   	}
   
   	stages {
@@ -76,7 +76,7 @@ pipeline {
 	        			        		
 	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", capella.getTestUpdateSiteURL("${CAPELLA_BRANCH}"), 'org.polarsys.capella.test.feature.feature.group')
 	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.scenario.editor.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.scenario.editor.feature.feature.group')
-	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "http://download.eclipse.org/releases/2021-06/", 'org.eclipse.xtext.sdk.feature.group')
+	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "https://download.eclipse.org/releases/2023-03/", 'org.eclipse.xtext.sdk.feature.group')
 	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.scenario.editor.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.scenario.editor.tests.feature.feature.group')
 	       		}         
 	     	}
diff --git a/features/org.polarsys.capella.scenario.editor.feature/feature.xml b/features/org.polarsys.capella.scenario.editor.feature/feature.xml
index b5bc4a22..ab9bf6a9 100644
--- a/features/org.polarsys.capella.scenario.editor.feature/feature.xml
+++ b/features/org.polarsys.capella.scenario.editor.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.polarsys.capella.scenario.editor.feature"
       label="%featureName"
-      version="0.11.1.qualifier"
+      version="0.12.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -89,4 +89,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.google.guava"
+         download-size="0"
+         install-size="0"
+         version="30.1.0.v20221112-0806"
+         unpack="false"/>
+
+   <plugin
+         id="org.aopalliance"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.polarsys.capella.scenario.editor.feature/pom.xml b/features/org.polarsys.capella.scenario.editor.feature/pom.xml
deleted file mode 100644
index 3a75cd30..00000000
--- a/features/org.polarsys.capella.scenario.editor.feature/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 THALES GLOBAL SERVICES.
-  
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-  
-  SPDX-License-Identifier: EPL-2.0
-  
-  Contributors:
-       Thales - initial API and implementation
--->
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>org.polarsys</groupId>
-	<artifactId>org.polarsys.capella.scenario.editor.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-
-	<parent>
-		<groupId>org.polarsys</groupId>
-		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
-
-    <properties>
-      <!-- Skip feature modules in Sonar analysis -->
-      <sonar.skip>true</sonar.skip>
-    </properties>
-</project>
diff --git a/features/org.polarsys.capella.scenario.editor.tests.feature/feature.xml b/features/org.polarsys.capella.scenario.editor.tests.feature/feature.xml
index 3e625a9e..c043f2f0 100644
--- a/features/org.polarsys.capella.scenario.editor.tests.feature/feature.xml
+++ b/features/org.polarsys.capella.scenario.editor.tests.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.polarsys.capella.scenario.editor.tests.feature"
       label="%featureName"
-      version="0.11.1.qualifier"
+      version="0.12.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.polarsys.capella.scenario.editor.tests.feature/pom.xml b/features/org.polarsys.capella.scenario.editor.tests.feature/pom.xml
deleted file mode 100644
index aacfe0bd..00000000
--- a/features/org.polarsys.capella.scenario.editor.tests.feature/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 THALES GLOBAL SERVICES.
-  
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-  
-  SPDX-License-Identifier: EPL-2.0
-  
-  Contributors:
-       Thales - initial API and implementation
--->
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>org.polarsys</groupId>
-	<artifactId>org.polarsys.capella.scenario.editor.tests.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-
-	<parent>
-		<groupId>org.polarsys</groupId>
-		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
-
-    <properties>
-      <!-- Skip feature modules in Sonar analysis -->
-      <sonar.skip>true</sonar.skip>
-    </properties>
-</project>
diff --git a/features/pom.xml b/features/pom.xml
index a79a28a2..5e0d1eed 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,16 +18,20 @@
 
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.scenario.editor.features</artifactId>
-	<version>0.11.1-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
+		<version>0.12.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
+    <properties>
+      <sonar.skip>true</sonar.skip>
+    </properties>
+    
 	<modules>
 		<module>org.polarsys.capella.scenario.editor.feature</module>
 		<module>org.polarsys.capella.scenario.editor.tests.feature</module>
diff --git a/plugins/org.polarsys.capella.scenario.editor.doc/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.doc/META-INF/MANIFEST.MF
index 975413e3..9acb9cc1 100644
--- a/plugins/org.polarsys.capella.scenario.editor.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.scenario.editor.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.doc;singleton:=true
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-Activator: org.polarsys.capella.scenario.editor.doc.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.polarsys.capella.scenario.editor.dsl.ide/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.dsl.ide/META-INF/MANIFEST.MF
index cc5f2b73..b21996d9 100644
--- a/plugins/org.polarsys.capella.scenario.editor.dsl.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.scenario.editor.dsl.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.polarsys.capella.scenario.editor.dsl.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.dsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.polarsys.capella.scenario.editor.dsl,
diff --git a/plugins/org.polarsys.capella.scenario.editor.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.dsl.ui/META-INF/MANIFEST.MF
index 1faad27e..7d2bd327 100644
--- a/plugins/org.polarsys.capella.scenario.editor.dsl.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.scenario.editor.dsl.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.polarsys.capella.scenario.editor.dsl.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.dsl.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.polarsys.capella.scenario.editor.dsl,
diff --git a/plugins/org.polarsys.capella.scenario.editor.dsl/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.dsl/META-INF/MANIFEST.MF
index 7fc95c32..8c2cdef3 100644
--- a/plugins/org.polarsys.capella.scenario.editor.dsl/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.scenario.editor.dsl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.polarsys.capella.scenario.editor.dsl
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.dsl; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext.xbase,
diff --git a/plugins/org.polarsys.capella.scenario.editor.embeddededitor/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.embeddededitor/META-INF/MANIFEST.MF
index bb92cad2..5fee367a 100644
--- a/plugins/org.polarsys.capella.scenario.editor.embeddededitor/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.scenario.editor.embeddededitor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.embeddededitor;singleton:=true
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Require-Bundle: org.polarsys.capella.scenario.editor.dsl.ui,
  org.eclipse.xtext.ui,
  org.polarsys.capella.scenario.editor.dsl,
diff --git a/plugins/org.polarsys.capella.scenario.editor/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor/META-INF/MANIFEST.MF
index aa7a2df2..1d84f89c 100644
--- a/plugins/org.polarsys.capella.scenario.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.scenario.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor;singleton:=true
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index f518b817..889724e8 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -17,16 +17,20 @@
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.scenario.editor.plugins</artifactId>
-	<version>0.11.1-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
+		<version>0.12.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
+	<properties>
+		<sonar.sources>src</sonar.sources>
+	</properties>
+	
 	<modules>
 		<module>org.polarsys.capella.scenario.editor</module>
 		<module>org.polarsys.capella.scenario.editor.dsl</module>
diff --git a/pom.xml b/pom.xml
index 709cb840..5831b8a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,13 +23,13 @@
   <name>Capella Textual Editor Addon</name>
   <groupId>org.polarsys</groupId>
   <artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-  <version>0.11.1-SNAPSHOT</version>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	    <tycho-version>2.6.0</tycho-version>
-	    <tycho-extras-version>2.6.0</tycho-extras-version>
+	    <tycho-version>2.7.5</tycho-version>
+	    <tycho-extras-version>2.7.5</tycho-extras-version>
 		<antrun-version>3.0.0</antrun-version>
 		<rcptt-version>2.5.3</rcptt-version>
 		<rcptt-runner-version>2.5.3</rcptt-runner-version>
@@ -44,7 +44,7 @@
 
 
 		<!-- for packaging -->
-		<platform-name>2021-06</platform-name>
+		<platform-name>2023-03</platform-name>
 		<eclipse-repo.url>https://download.eclipse.org/releases/${platform-name}</eclipse-repo.url>
 		<packagedAddonName>TextualEditor</packagedAddonName>
 
@@ -102,26 +102,16 @@
 						<artifact>
 							<groupId>org.polarsys</groupId>
 							<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-							<version>0.11.1-SNAPSHOT</version>
+							<version>0.12.0-SNAPSHOT</version>
 							<classifier>releng/org.polarsys.capella.scenario.editor.update/capella.target-definition</classifier>
 						</artifact>
 					</target>
 					<environments>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
 					</environments>
 				</configuration>
 			</plugin>
@@ -205,11 +195,11 @@
 								<type>eclipse-feature</type>
 							</dependency>
 							<dependency>
-								<artifactId>org.eclipse.equinox.ds</artifactId>
+								<artifactId>org.apache.felix.scr</artifactId>
 								<type>eclipse-plugin</type>
 							</dependency>
 						</dependencies>
-						<executionEnvironment>JavaSE-11</executionEnvironment>
+						<executionEnvironment>JavaSE-17</executionEnvironment>
 					</configuration>
 					<executions>
 						<execution>
@@ -307,20 +297,6 @@
 		</activation>
 		<build>
 				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200a-plugin</artifactId>
-						<version>${tycho-extras-version}</version>
-						<executions>
-							<execution>
-								<id>pack200-normalize</id>
-								<phase>package</phase>
-								<goals>
-									<goal>normalize</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.eclipse.cbi.maven.plugins</groupId>
 						<artifactId>eclipse-jarsigner-plugin</artifactId>
@@ -335,20 +311,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200b-plugin</artifactId>
-						<version>${tycho-extras-version}</version>
-						<executions>
-							<execution>
-								<id>pack200-pack</id>
-								<phase>package</phase>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 			<pluginRepositories>
diff --git a/releng/org.polarsys.capella.scenario.editor.site/category.xml b/releng/org.polarsys.capella.scenario.editor.site/category.xml
index a3b4bd9b..e86f20b3 100644
--- a/releng/org.polarsys.capella.scenario.editor.site/category.xml
+++ b/releng/org.polarsys.capella.scenario.editor.site/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.polarsys.capella.scenario.editor.feature" version="0.11.1.qualifier">
+   <feature id="org.polarsys.capella.scenario.editor.feature" version="0.12.0.qualifier">
       <category name="org.polarsys.capella.scenario.editor"/>
    </feature>
    <feature id="org.polarsys.capella.scenario.editor.tests.feature">
diff --git a/releng/org.polarsys.capella.scenario.editor.site/pom.xml b/releng/org.polarsys.capella.scenario.editor.site/pom.xml
index ff5aba92..151e22aa 100644
--- a/releng/org.polarsys.capella.scenario.editor.site/pom.xml
+++ b/releng/org.polarsys.capella.scenario.editor.site/pom.xml
@@ -17,12 +17,12 @@
 
 	<artifactId>org.polarsys.capella.scenario.editor.site</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>0.11.1-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
+		<version>0.12.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
diff --git a/releng/org.polarsys.capella.scenario.editor.update/capella.target-definition.targetplatform b/releng/org.polarsys.capella.scenario.editor.update/capella.target-definition.targetplatform
index 465a3641..c9c628ed 100644
--- a/releng/org.polarsys.capella.scenario.editor.update/capella.target-definition.targetplatform
+++ b/releng/org.polarsys.capella.scenario.editor.update/capella.target-definition.targetplatform
@@ -12,19 +12,29 @@
  *******************************************************************************/
 target "CapellaScenariosTextEditor"
 
-include "https://raw.githubusercontent.com/eclipse-capella/capella/v6.x/releng/plugins/org.polarsys.capella.targets/full/capella.target-definition.targetplatform"
+include "https://download.eclipse.org/capella/core/updates/releases/7.0.0/targets/capella.target-definition.targetplatform"
 
 with source, requirements
 
-location capella-core-master "https://download.eclipse.org/capella/core/updates/releases/6.1.0/org.polarsys.capella.rcp.site" {
-	org.polarsys.capella.rcp.feature.group
+location capella-core-master "https://download.eclipse.org/capella/core/updates/releases/7.0.0/org.polarsys.capella.rcp.site" {
+    org.polarsys.capella.rcp.feature.group
 }
 
-location capella-tests-master "https://download.eclipse.org/capella/core/updates/releases/6.1.0/org.polarsys.capella.test.site" {
-	org.polarsys.capella.test.feature.feature.group
+location capella-tests-master "https://download.eclipse.org/capella/core/updates/releases/7.0.0/org.polarsys.capella.test.site" {
+    org.polarsys.capella.test.feature.feature.group
 }
 
-location "http://download.eclipse.org/releases/2021-06/" {
+location "https://download.eclipse.org/releases/2023-03/202303151000/" {
+    // com.google.guava com.google.inject and org.aopalliance are dependencies from xtext.redist.
+    // but xtext-2023-03 requires exact guava 30.1.0.v20221112-0806 which is older than the one on capella 7.0.
+    // So version has been embedded in the addon and version hardcoded in the org.polarsys.capella.scenario.editor.feature/feature.xml
+    // when upgrading to new version, set 0.0.0 in feature.xml to see if it still required to embed another version than the one already embedded in capella.
+    // if already embedded, can be removed from feature.xml. Same for com.google.inject and org.aopalliance. If no longer required, can be removed from feature.
+    
+    // com.google.guava //already included with lazy version in capella.target-definition.targetplatform so we can't force a version here.
+    com.google.inject
+    org.aopalliance
     org.eclipse.xtext.redist.feature.group
     org.eclipse.xtext.sdk.feature.group
-}
\ No newline at end of file
+}
+
diff --git a/releng/org.polarsys.capella.scenario.editor.update/pom.xml b/releng/org.polarsys.capella.scenario.editor.update/pom.xml
index d1d8e62b..af19e932 100644
--- a/releng/org.polarsys.capella.scenario.editor.update/pom.xml
+++ b/releng/org.polarsys.capella.scenario.editor.update/pom.xml
@@ -17,7 +17,7 @@
 
 	<groupId>org.polarsys</groupId>
 	<artifactId>capella.target-definition</artifactId>
-	<version>0.11.1-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<licenses>
@@ -35,10 +35,10 @@
 	</licenses>
 
 	<properties>
-		<tycho-version>0.26.0</tycho-version>
-		<tycho-extras-version>0.26.0</tycho-extras-version>
+		<tycho-version>2.7.5</tycho-version>
+		<tycho-extras-version>2.7.5</tycho-extras-version>
 		<targetPlatform.name>capella.target-definition.targetplatform</targetPlatform.name>
-		<converterApplication.name>fr.obeo.releng.targetplatform.targetPlatform.converter</converterApplication.name>
+		<converterApplication.name>org.eclipse.cbi.targetplatform.tpd.converter</converterApplication.name>
 		<sonar.skip>true</sonar.skip>
 	</properties>
 
@@ -53,18 +53,18 @@
 						<repository>
 							<id>targetplatform-tp</id>
 							<layout>p2</layout>
-							<url>http://download.eclipse.org/releases/oxygen/201709271000</url>
+							<url>https://download.eclipse.org/releases/2023-03</url>
 						</repository>
 						<repository>
 							<id>targetplatform</id>
 							<layout>p2</layout>
-							<url>http://pdulth.github.io/fr.obeo.releng.targetplatform/p2/latest</url>
+							<url>https://download.eclipse.org/cbi/updates/tpd/nightly/latest</url>
 						</repository>
 					</repositories>
 					<!-- Set dependencies to launch the application -->
 					<dependencies>
 						<dependency>
-							<artifactId>fr.obeo.releng.targetplatform-feature</artifactId>
+							<artifactId>org.eclipse.cbi.targetplatform.feature</artifactId>
 							<type>eclipse-feature</type>
 						</dependency>
 						<dependency>
@@ -72,13 +72,14 @@
 							<type>eclipse-feature</type>
 						</dependency>
 					</dependencies>
+					<executionEnvironment>JavaSE-17</executionEnvironment>
 				</configuration>
 				<executions>
 					<execution>
 						<id>generate.target</id>
 						<phase>validate</phase>
 						<configuration>
-							<executionEnvironment>JavaSE-1.8</executionEnvironment>
+							<executionEnvironment>JavaSE-17</executionEnvironment>
 							<applicationsArgs>
 								<args>-application ${converterApplication.name} ${targetPlatform.name}</args>
 							</applicationsArgs>
diff --git a/sonar-project.properties b/sonar-project.properties
index 530294f1..fd67b103 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectKey=org.polarsys.capella.scenario.editor
 sonar.projectName=Capella Textual Editor
-sonar.projectVersion=0.11.1
+sonar.projectVersion=0.12.0
 sonar.sources=src
 sonar.binaries=bin
 sonar.modules=org.polarsys.capella.scenario.editor
\ No newline at end of file
diff --git a/tests/org.polarsys.capella.scenario.editor.dsl.tests/META-INF/MANIFEST.MF b/tests/org.polarsys.capella.scenario.editor.dsl.tests/META-INF/MANIFEST.MF
index 07d960f0..6b04f969 100644
--- a/tests/org.polarsys.capella.scenario.editor.dsl.tests/META-INF/MANIFEST.MF
+++ b/tests/org.polarsys.capella.scenario.editor.dsl.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.polarsys.capella.scenario.editor.dsl.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: org.polarsys.capella.scenario.editor.dsl.tests
 Bundle-Vendor: Eclipse.org
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.dsl.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.polarsys.capella.scenario.editor.dsl,
diff --git a/tests/org.polarsys.capella.scenario.editor.dsl.ui.tests/META-INF/MANIFEST.MF b/tests/org.polarsys.capella.scenario.editor.dsl.ui.tests/META-INF/MANIFEST.MF
index 5465f335..10d89ad3 100644
--- a/tests/org.polarsys.capella.scenario.editor.dsl.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.polarsys.capella.scenario.editor.dsl.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.polarsys.capella.scenario.editor.dsl.ui.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: org.polarsys.capella.scenario.editor.dsl.ui.tests
 Bundle-Vendor: Eclipse.org
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.dsl.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.polarsys.capella.scenario.editor.dsl.ui,
diff --git a/tests/org.polarsys.capella.scenario.editor.ju/META-INF/MANIFEST.MF b/tests/org.polarsys.capella.scenario.editor.ju/META-INF/MANIFEST.MF
index ae333750..10352c83 100644
--- a/tests/org.polarsys.capella.scenario.editor.ju/META-INF/MANIFEST.MF
+++ b/tests/org.polarsys.capella.scenario.editor.ju/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.ju;singleton:=true
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
diff --git a/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.afm b/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.afm
index 9dafe85d..3a25172e 100644
--- a/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.afm
+++ b/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.afm
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_Tyz14PzdEeqpz7UppfXcPA">
-  <viewpointReferences id="_TzImAPzdEeqpz7UppfXcPA" vpId="org.polarsys.capella.core.viewpoint" version="6.1.0"/>
+  <viewpointReferences id="_TzImAPzdEeqpz7UppfXcPA" vpId="org.polarsys.capella.core.viewpoint" version="7.0.0"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.aird b/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.aird
index 0ed44bf2..e631ec4d 100644
--- a/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.aird
+++ b/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.aird
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/6.0.0" xmlns:org.polarsys.capella.core.data.cs="http://www.polarsys.org/capella/core/cs/6.0.0" xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/6.0.0" xmlns:org.polarsys.capella.core.data.fa="http://www.polarsys.org/capella/core/fa/6.0.0" xmlns:org.polarsys.capella.core.data.interaction="http://www.polarsys.org/capella/core/interaction/6.0.0" xmlns:org.polarsys.capella.core.data.la="http://www.polarsys.org/capella/core/la/6.0.0" xmlns:org.polarsys.capella.core.data.oa="http://www.polarsys.org/capella/core/oa/6.0.0" xmlns:sequence="http://www.eclipse.org/sirius/diagram/sequence/2.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0 http://www.eclipse.org/sirius/diagram/sequence/2.0.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/filter/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/filter http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
-  <viewpoint:DAnalysis uid="_Ty1rEPzdEeqpz7UppfXcPA" selectedViews="_TzTlIPzdEeqpz7UppfXcPA _Tz6pIPzdEeqpz7UppfXcPA _T50c0PzdEeqpz7UppfXcPA _T6PTkPzdEeqpz7UppfXcPA _T6ZEkPzdEeqpz7UppfXcPA _T8hLgPzdEeqpz7UppfXcPA _T9FzQPzdEeqpz7UppfXcPA" version="15.1.0.202211301600">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/7.0.0" xmlns:org.polarsys.capella.core.data.cs="http://www.polarsys.org/capella/core/cs/7.0.0" xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/7.0.0" xmlns:org.polarsys.capella.core.data.fa="http://www.polarsys.org/capella/core/fa/7.0.0" xmlns:org.polarsys.capella.core.data.interaction="http://www.polarsys.org/capella/core/interaction/7.0.0" xmlns:org.polarsys.capella.core.data.la="http://www.polarsys.org/capella/core/la/7.0.0" xmlns:org.polarsys.capella.core.data.oa="http://www.polarsys.org/capella/core/oa/7.0.0" xmlns:sequence="http://www.eclipse.org/sirius/diagram/sequence/2.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0 http://www.eclipse.org/sirius/diagram/sequence/2.0.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/filter/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/filter http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis uid="_Ty1rEPzdEeqpz7UppfXcPA" selectedViews="_TzTlIPzdEeqpz7UppfXcPA _Tz6pIPzdEeqpz7UppfXcPA _T50c0PzdEeqpz7UppfXcPA _T6PTkPzdEeqpz7UppfXcPA _T6ZEkPzdEeqpz7UppfXcPA _T8hLgPzdEeqpz7UppfXcPA _T9FzQPzdEeqpz7UppfXcPA" version="15.4.1.202403191723">
     <semanticResources>TextualEditor.afm</semanticResources>
     <semanticResources>TextualEditor.capella</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_TzTlIPzdEeqpz7UppfXcPA">
@@ -1471,7 +1471,7 @@
             <styles xmi:type="notation:ShapeStyle" xmi:id="_M3SAxghuEeux4qCL-hP6Ng" fontName="Segoe UI"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M3SAxwhuEeux4qCL-hP6Ng"/>
           </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_1CB4QQhsEeux4qCL-hP6Ng" fontColor="3038217" fontName="Segoe UI" fontHeight="8"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_1CB4QQhsEeux4qCL-hP6Ng" fontName="Segoe UI" fontHeight="8"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1CB4QghsEeux4qCL-hP6Ng" x="135" y="50" width="100" height="50"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_1UdsEAhsEeux4qCL-hP6Ng" type="2001" element="_1UNNYAhsEeux4qCL-hP6Ng">
@@ -1526,7 +1526,7 @@
             <styles xmi:type="notation:ShapeStyle" xmi:id="_M3SAyQhuEeux4qCL-hP6Ng" fontName="Segoe UI"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M3SAyghuEeux4qCL-hP6Ng"/>
           </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_1UdsEQhsEeux4qCL-hP6Ng" fontColor="3038217" fontName="Segoe UI" fontHeight="8"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_1UdsEQhsEeux4qCL-hP6Ng" fontName="Segoe UI" fontHeight="8"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1UdsEghsEeux4qCL-hP6Ng" x="387" y="50" width="100" height="50"/>
         </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_zc-mCQhsEeux4qCL-hP6Ng"/>
diff --git a/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.capella b/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.capella
index 287d0f3c..5f468d46 100644
--- a/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.capella
+++ b/tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.capella
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--Capella_Version_6.1.0-->
+<!--Capella_Version_7.0.0-->
 <org.polarsys.capella.core.data.capellamodeller:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/6.0.0"
-    xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/6.0.0"
-    xmlns:org.polarsys.capella.core.data.capellacore="http://www.polarsys.org/capella/core/core/6.0.0"
-    xmlns:org.polarsys.capella.core.data.capellamodeller="http://www.polarsys.org/capella/core/modeller/6.0.0"
-    xmlns:org.polarsys.capella.core.data.cs="http://www.polarsys.org/capella/core/cs/6.0.0"
-    xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/6.0.0"
-    xmlns:org.polarsys.capella.core.data.epbs="http://www.polarsys.org/capella/core/epbs/6.0.0"
-    xmlns:org.polarsys.capella.core.data.fa="http://www.polarsys.org/capella/core/fa/6.0.0"
-    xmlns:org.polarsys.capella.core.data.information="http://www.polarsys.org/capella/core/information/6.0.0"
-    xmlns:org.polarsys.capella.core.data.information.datatype="http://www.polarsys.org/capella/core/information/datatype/6.0.0"
-    xmlns:org.polarsys.capella.core.data.information.datavalue="http://www.polarsys.org/capella/core/information/datavalue/6.0.0"
-    xmlns:org.polarsys.capella.core.data.interaction="http://www.polarsys.org/capella/core/interaction/6.0.0"
-    xmlns:org.polarsys.capella.core.data.la="http://www.polarsys.org/capella/core/la/6.0.0"
-    xmlns:org.polarsys.capella.core.data.oa="http://www.polarsys.org/capella/core/oa/6.0.0"
-    xmlns:org.polarsys.capella.core.data.pa="http://www.polarsys.org/capella/core/pa/6.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/7.0.0"
+    xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/7.0.0"
+    xmlns:org.polarsys.capella.core.data.capellacore="http://www.polarsys.org/capella/core/core/7.0.0"
+    xmlns:org.polarsys.capella.core.data.capellamodeller="http://www.polarsys.org/capella/core/modeller/7.0.0"
+    xmlns:org.polarsys.capella.core.data.cs="http://www.polarsys.org/capella/core/cs/7.0.0"
+    xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/7.0.0"
+    xmlns:org.polarsys.capella.core.data.epbs="http://www.polarsys.org/capella/core/epbs/7.0.0"
+    xmlns:org.polarsys.capella.core.data.fa="http://www.polarsys.org/capella/core/fa/7.0.0"
+    xmlns:org.polarsys.capella.core.data.information="http://www.polarsys.org/capella/core/information/7.0.0"
+    xmlns:org.polarsys.capella.core.data.information.datatype="http://www.polarsys.org/capella/core/information/datatype/7.0.0"
+    xmlns:org.polarsys.capella.core.data.information.datavalue="http://www.polarsys.org/capella/core/information/datavalue/7.0.0"
+    xmlns:org.polarsys.capella.core.data.interaction="http://www.polarsys.org/capella/core/interaction/7.0.0"
+    xmlns:org.polarsys.capella.core.data.la="http://www.polarsys.org/capella/core/la/7.0.0"
+    xmlns:org.polarsys.capella.core.data.oa="http://www.polarsys.org/capella/core/oa/7.0.0"
+    xmlns:org.polarsys.capella.core.data.pa="http://www.polarsys.org/capella/core/pa/7.0.0"
     id="97a7043b-179c-4a96-9218-3d27478c759a"
     name="TextualEditor">
   <ownedExtensions xsi:type="libraries:ModelInformation" id="60ff63d1-7268-4d78-8ca4-8e9d67939e1d"/>
diff --git a/tests/org.polarsys.capella.scenario.editor.ju/pom.xml b/tests/org.polarsys.capella.scenario.editor.ju/pom.xml
index 50ddf32c..f726031a 100644
--- a/tests/org.polarsys.capella.scenario.editor.ju/pom.xml
+++ b/tests/org.polarsys.capella.scenario.editor.ju/pom.xml
@@ -19,15 +19,20 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
+		<version>0.12.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.scenario.editor.ju</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>0.11.1-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 
+	<properties>
+		<!-- Skip feature modules in Sonar analysis -->
+		<sonar.skip>true</sonar.skip>
+	</properties>
+	
 	<build>
 		<plugins>
 			<plugin>