Merge branch 'master' into 1383_use_AnalysisResult_in_power_requireme…

…nts_analysis
osate · Nov 23, 2021 · 7d234a0 · 7d234a0
2 parents c56a978 + 6d25fcc
commit 7d234a0
Show file tree

Hide file tree

Showing 89 changed files with 1,040 additions and 282 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
           ''')
           wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
             sh(script: '''
-                mvn -T 1 -s core/osate.releng/seisettings.xml clean verify -Pfull \
+                mvn -T 3 -s core/osate.releng/seisettings.xml clean verify -Pfull \
                     -Dtycho.disableP2Mirrors=true -DfailIfNoTests=false \
                     -Dcodecoverage=true -Dspotbugs=true
             ''')

diff --git a/Jenkinsfile.PR b/Jenkinsfile.PR
@@ -9,7 +9,7 @@ pipeline {
             withMaven(maven: 'M3', mavenLocalRepo: '.repository', publisherStrategy: 'EXPLICIT') {
                sh 'mvn -s core/osate.releng/seisettings.xml org.codehaus.mojo:versions-maven-plugin:use-reactor -DgenerateBackupPoms=false -Dtycho.mode=maven'
                wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
-                  sh 'mvn -T 1 -s core/osate.releng/seisettings.xml clean verify -Plocal -Dtycho.disableP2Mirrors=true -DfailIfNoTests=false -Dcodecoverage=true -Dspotbugs=true -Dpr.build=true'
+                  sh 'mvn -T 3 -s core/osate.releng/seisettings.xml clean verify -Plocal -Dtycho.disableP2Mirrors=true -DfailIfNoTests=false -Dcodecoverage=true -Dspotbugs=true -Dpr.build=true'
                }
             }
          }

diff --git a/alisa/org.osate.alisa.common.ui/META-INF/MANIFEST.MF b/alisa/org.osate.alisa.common.ui/META-INF/MANIFEST.MF
@@ -16,12 +16,12 @@ Require-Bundle: org.osate.alisa.common;bundle-version="[3.0.0,4.0.0)";visibility
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.compare;bundle-version="[3.7.0,4.0.0)",
  org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
- org.osate.aadl2.instantiation;bundle-version="[1.1.0,2.0.0)",
- org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)",
- org.osate.xtext.aadl2;bundle-version="[6.0.0,7.0.0)",
+ org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)",
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)",
+ org.osate.xtext.aadl2;bundle-version="[6.1.0,7.0.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
  org.osate.reqspec;bundle-version="[3.0.0,4.0.0)",
- org.osate.xtext.aadl2.ui;bundle-version="[6.1.0,7.0.0)",
+ org.osate.xtext.aadl2.ui;bundle-version="[6.2.0,7.0.0)",
  org.eclipse.xtend.lib;bundle-version="[2.20.0,3.0.0)";resolution:=optional
 Import-Package: org.eclipse.xsemantics.runtime,
  org.apache.log4j;version="[1.2.0,2.0.0)"

diff --git a/alisa/org.osate.alisa.common/META-INF/MANIFEST.MF b/alisa/org.osate.alisa.common/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
  org.eclipse.xsemantics.runtime;bundle-version="[1.19.0,2.0.0)",
  org.osate.results;bundle-version="[3.0.0,4.0.0)",
  org.osate.aadl2.modelsupport;bundle-version="[6.0.0,7.0.0)",
- org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)"
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)"
 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.osate.alisa.common,

diff --git a/alisa/org.osate.alisa.contribution/META-INF/MANIFEST.MF b/alisa/org.osate.alisa.contribution/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Contribution
 Bundle-SymbolicName: org.osate.alisa.contribution;singleton:=true
-Bundle-Version: 1.0.6.qualifier
+Bundle-Version: 1.0.7.qualifier
 Export-Package: alisa_consistency
-Require-Bundle: org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)",
+Require-Bundle: org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)",
  org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
  org.osate.results;bundle-version="[3.0.0,4.0.0)",
  org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)"

diff --git a/alisa/org.osate.alisa.contribution/pom.xml b/alisa/org.osate.alisa.contribution/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.osate</groupId>
 	<artifactId>org.osate.alisa.contribution</artifactId>
-	<version>1.0.6-SNAPSHOT</version>
+	<version>1.0.7-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/alisa/org.osate.alisa.workbench.ui/META-INF/MANIFEST.MF b/alisa/org.osate.alisa.workbench.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.osate.alisa.workbench;bundle-version="[3.0.0,4.0.0)";visibil
  org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
- org.osate.aadl2.instantiation;bundle-version="[1.1.0,2.0.0)",
+ org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)",
  org.osate.ui;bundle-version="[6.2.0,7.0.0)",
  org.osate.assure;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.jdt.debug.ui;bundle-version="[3.10.0,4.0.0)",

diff --git a/alisa/org.osate.alisa.workbench/META-INF/MANIFEST.MF b/alisa/org.osate.alisa.workbench/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
  org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
  org.osate.reqspec;bundle-version="[3.0.0,4.0.0)",
  org.osate.alisa.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.osate.aadl2.instantiation;bundle-version="[1.1.0,2.0.0)",
+ org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)",
  org.osate.categories;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.xtext.ui;bundle-version="[2.20.0,3.0.0)";visibility:=reexport,
  org.objectweb.asm;bundle-version="[9.1.0,9.2.0)";resolution:=optional,

diff --git a/alisa/org.osate.assure/META-INF/MANIFEST.MF b/alisa/org.osate.assure/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
  org.eclipse.core.resources;bundle-version="[3.9.1,4.0.0)",
  org.osate.aadl2.modelsupport;bundle-version="[6.0.0,7.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)",
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)",
  org.eclipse.xtext.ui;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.ui.editors;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
@@ -36,11 +36,11 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.compare;bundle-version="[3.5.101,4.0.0)",
  org.osate.alisa.workbench;bundle-version="[3.0.0,4.0.0)",
- org.osate.aadl2.instantiation;bundle-version="[1.1.0,2.0.0)",
+ org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.xsemantics.runtime;bundle-version="[1.8.1,2.0.0)",
  org.osate.results;bundle-version="[3.0.0,4.0.0)",
- org.osate.xtext.aadl2;bundle-version="[6.0.0,7.0.0)",
+ org.osate.xtext.aadl2;bundle-version="[6.1.0,7.0.0)",
  org.osate.organization;bundle-version="[3.0.0,4.0.0)",
  org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)"
 Import-Package: com.rockwellcollins.atc.resolute.analysis.execution;resolution:=optional,

diff --git a/alisa/org.osate.reqspec.ui/META-INF/MANIFEST.MF b/alisa/org.osate.reqspec.ui/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.osate.reqspec;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
  org.osate.categories;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.xtend.lib;bundle-version="[2.20.0,3.0.0)",
- org.osate.xtext.aadl2.ui;bundle-version="[6.1.0,7.0.0)",
+ org.osate.xtext.aadl2.ui;bundle-version="[6.2.0,7.0.0)",
  org.osate.ui;bundle-version="[6.2.0,7.0.0)"
 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/alisa/org.osate.reqspec/META-INF/MANIFEST.MF b/alisa/org.osate.reqspec/META-INF/MANIFEST.MF
@@ -23,10 +23,10 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
  org.osate.alisa.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.osate.categories;bundle-version="[3.0.0,4.0.0)",
  org.osate.organization;bundle-version="[3.0.0,4.0.0)",
- org.osate.xtext.aadl2;bundle-version="[6.0.0,7.0.0)",
+ org.osate.xtext.aadl2;bundle-version="[6.1.0,7.0.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
  org.osate.xtext.aadl2.errormodel;bundle-version="[6.2.0,7.0.0)",
- org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)"
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.osate.reqspec,
  org.osate.reqspec.generator,

diff --git a/alisa/org.osate.reqtrace/META-INF/MANIFEST.MF b/alisa/org.osate.reqtrace/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.115.0,4.0.0)",
  org.osate.reqspec;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.xtext.ui;bundle-version="[2.20.0,3.0.0)",
- org.osate.xtext.aadl2.ui;bundle-version="[6.1.0,7.0.0)",
+ org.osate.xtext.aadl2.ui;bundle-version="[6.2.0,7.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.birt.report.engine;bundle-version="[4.7.0,5.0.0)",

diff --git a/alisa/org.osate.verify.ui/META-INF/MANIFEST.MF b/alisa/org.osate.verify.ui/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.osate.verify;bundle-version="[4.0.0,5.0.0)";visibility:=reex
  org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
  org.osate.categories;bundle-version="[3.0.0,4.0.0)",
  org.osate.aadl2.modelsupport;bundle-version="[6.0.0,7.0.0)",
- org.osate.xtext.aadl2.ui;bundle-version="[6.1.0,7.0.0)",
+ org.osate.xtext.aadl2.ui;bundle-version="[6.2.0,7.0.0)",
  org.osate.ui;bundle-version="[6.2.0,7.0.0)",
  org.osate.assure;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.xtend.lib;bundle-version="[2.20.0,3.0.0)";resolution:=optional

diff --git a/alisa/org.osate.verify/META-INF/MANIFEST.MF b/alisa/org.osate.verify/META-INF/MANIFEST.MF
@@ -36,7 +36,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
  org.osate.organization;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.13.2,4.0.0)",
  org.osate.aadl2.modelsupport;bundle-version="[6.0.0,7.0.0)",
- org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)",
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)",
  org.osate.ui;bundle-version="[6.2.0,7.0.0)"
 Import-Package: com.rockwellcollins.atc.resolute.resolute;resolution:=optional,
  org.apache.log4j;version="[1.2.0,2.0.0)"

diff --git a/analyses/org.osate.analysis.architecture/META-INF/MANIFEST.MF b/analyses/org.osate.analysis.architecture/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.osate.analysis.architecture;singleton:=true
-Bundle-Version: 2.0.2.qualifier
+Bundle-Version: 2.0.4.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.osate.analysis.architecture.ArchitecturePlugin
 Bundle-Vendor: CMU/SEI
@@ -11,14 +11,17 @@ Export-Package:
  org.osate.analysis.architecture,
  org.osate.analysis.architecture.handlers
 Require-Bundle: org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
- org.osate.ui;bundle-version="[6.0.0,7.0.0)",
- org.osate.xtext.aadl2.properties;bundle-version="[3.0.0,4.0.0)",
- org.osate.xtext.aadl2;bundle-version="[6.0.0,7.0.0)",
- org.osate.results;bundle-version="[2.0.0,3.0.0)",
+ org.osate.ui;bundle-version="[6.2.0,7.0.0)",
+ org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)",
+ org.osate.xtext.aadl2;bundle-version="[6.1.0,7.0.0)",
+ org.osate.results;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.13.1,4.0.0)",
  org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)"
+ org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)",
+ org.osate.aadl2.contrib;bundle-version="[1.1.0, 2.0.0)",
+ org.osate.contribution.sei;bundle-version="[1.2.0,2.0.0)",
+ org.osate.pluginsupport;bundle-version="[7.1.0, 8.0.0)"
 Bundle-ActivationPolicy: lazy
 Import-Package: org.osate.contribution.sei.names
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/analyses/org.osate.analysis.architecture/pom.xml b/analyses/org.osate.analysis.architecture/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.osate</groupId>
 	<artifactId>org.osate.analysis.architecture</artifactId>
-	<version>2.0.2-SNAPSHOT</version>
+	<version>2.0.4-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>

diff --git a/analyses/org.osate.analysis.flows/META-INF/MANIFEST.MF b/analyses/org.osate.analysis.flows/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.osate.analysis.flows;singleton:=true
-Bundle-Version: 5.0.1.qualifier
+Bundle-Version: 5.0.3.qualifier
 Bundle-Activator: org.osate.analysis.flows.FlowanalysisPlugin
 Bundle-Vendor: CMU/SEI
 Bundle-Localization: plugin
@@ -18,7 +18,9 @@ Require-Bundle: org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
  org.osate.ui;bundle-version="[6.1.0,7.0.0)",
  org.osate.xtext.aadl2.properties;bundle-version="[3.0.0,4.0.0)",
  org.osate.contribution.sei;bundle-version="[1.2.0,3.0.0)",
- org.osate.results;bundle-version="[2.0.0,3.0.0)"
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)",
+ org.osate.aadl2.contrib;bundle-version="[1.1.0,2.0.0)",
+ org.osate.results;bundle-version="[3.0.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.osate.analysis.flows
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/analyses/org.osate.analysis.flows/pom.xml b/analyses/org.osate.analysis.flows/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.osate</groupId>
 	<artifactId>org.osate.analysis.flows</artifactId>
-	<version>5.0.1-SNAPSHOT</version>
+	<version>5.0.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>

diff --git a/analyses/org.osate.analysis.resource.budgets/META-INF/MANIFEST.MF b/analyses/org.osate.analysis.resource.budgets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Resource Analysis Plug-in
 Bundle-SymbolicName: org.osate.analysis.resource.budgets;singleton:=true
-Bundle-Version: 4.0.3.qualifier
+Bundle-Version: 4.0.5.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.osate.analysis.resource.budgets.ResourceBudgetPlugin
 Bundle-Vendor: CMU/SEI
@@ -17,7 +17,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.115.0,4.0.0)",
  org.osate.xtext.aadl2.properties;bundle-version="[3.0.0,4.0.0)",
  org.osate.analysis.architecture;bundle-version="[2.0.0,3.0.0)",
  org.osate.analysis.flows;bundle-version="[5.0.0,6.0.0)",
- org.osate.results;bundle-version="[2.0.0,3.0.0)",
+ org.osate.results;bundle-version="[3.0.0,4.0.0)",
+ org.osate.aadl2.contrib;bundle-version="[1.1.0,2.0.0)",
+ org.osate.contribution.sei;bundle-version="[1.2.0,2.0.0)",
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)",
  org.osate.analysis.model;bundle-version="[1.0.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.osate.analysis.resource.budgets,

diff --git a/analyses/org.osate.analysis.resource.budgets/pom.xml b/analyses/org.osate.analysis.resource.budgets/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.osate</groupId>
 	<artifactId>org.osate.analysis.resource.budgets</artifactId>
-	<version>4.0.3-SNAPSHOT</version>
+	<version>4.0.5-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>

diff --git a/analyses/org.osate.plugins.feature/feature.xml b/analyses/org.osate.plugins.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.osate.plugins.feature"
       label="Open Source AADL Tool Environment Analysis Plug-ins"
-      version="6.1.0.qualifier"
+      version="6.1.2.qualifier"
       provider-name="CMU-SEI"
       plugin="org.osate.branding"
       image="icons/osateupdate_120.jpg"

diff --git a/analyses/org.osate.plugins.feature/pom.xml b/analyses/org.osate.plugins.feature/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.osate</groupId>
 	<artifactId>org.osate.plugins.feature</artifactId>
-	<version>6.1.0-SNAPSHOT</version>
+	<version>6.1.2-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<build>

diff --git a/ba/org.osate.ba.contrib/META-INF/MANIFEST.MF b/ba/org.osate.ba.contrib/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Property Set Contribution
 Bundle-SymbolicName: org.osate.ba.contrib;singleton:=true
-Bundle-Version: 1.0.6.qualifier
+Bundle-Version: 1.0.7.qualifier
 Bundle-Activator: org.osate.ba.contrib.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.115.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)",
- org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)"
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: TELECOM ParisTech

diff --git a/ba/org.osate.ba.contrib/pom.xml b/ba/org.osate.ba.contrib/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.osate</groupId>
 	<artifactId>org.osate.ba.contrib</artifactId>
-	<version>1.0.6-SNAPSHOT</version>
+	<version>1.0.7-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/ba/org.osate.ba.feature/feature.xml b/ba/org.osate.ba.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.osate.ba.feature"
       label="AADL-BA-FrontEnd"
-      version="5.1.1.qualifier"
+      version="5.1.2.qualifier"
       provider-name="TELECOM ParisTech"
       plugin="org.osate.ba">
 

diff --git a/ba/org.osate.ba.feature/pom.xml b/ba/org.osate.ba.feature/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.osate</groupId>
 	<artifactId>org.osate.ba.feature</artifactId>
-	<version>5.1.1-SNAPSHOT</version>
+	<version>5.1.2-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<build>

diff --git a/core/org.osate.aadl2.contrib/META-INF/MANIFEST.MF b/core/org.osate.aadl2.contrib/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Standard Property Set Contributions
 Bundle-SymbolicName: org.osate.aadl2.contrib;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.osate.aadl2.contrib.Activator
 Bundle-Vendor: CMU/SEI
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
  org.osate.aadl2.modelsupport;bundle-version="[6.0.0,7.0.0)",
- org.osate.pluginsupport;bundle-version="[7.0.0,8.0.0)"
+ org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.osate.aadl2.contrib
 Bundle-ActivationPolicy: lazy

diff --git a/core/org.osate.aadl2.contrib/pom.xml b/core/org.osate.aadl2.contrib/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.osate</groupId>
 	<artifactId>org.osate.aadl2.contrib</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/core/org.osate.aadl2.instance.textual.ui/META-INF/MANIFEST.MF b/core/org.osate.aadl2.instance.textual.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.osate.aadl2.instance.textual;bundle-version="[2.0.0,3.0.0)";
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.compare;bundle-version="[3.7.0,4.0.0)",
  org.osate.xtext.aadl2.properties.ui;bundle-version="[4.1.0,5.0.0)",
- org.osate.xtext.aadl2.ui;bundle-version="[6.1.0,7.0.0)",
+ org.osate.xtext.aadl2.ui;bundle-version="[6.2.0,7.0.0)",
  org.osate.aadl2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)"
 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"

diff --git a/core/org.osate.aadl2.instance.textual/META-INF/MANIFEST.MF b/core/org.osate.aadl2.instance.textual/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
  org.objectweb.asm;bundle-version="[9.1.0,9.2.0)";resolution:=optional,
  org.eclipse.emf.mwe2.launch;bundle-version="[2.8.0,3.0.0)";resolution:=optional,
  org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)";resolution:=optional,
- org.osate.xtext.aadl2;bundle-version="[6.0.0,7.0.0)",
+ org.osate.xtext.aadl2;bundle-version="[6.1.0,7.0.0)",
  org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.xtext.util;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.20.0,3.0.0)",

diff --git a/core/org.osate.aadl2.instantiation/.classpath b/core/org.osate.aadl2.instantiation/.classpath
@@ -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-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.osate.aadl2.instantiation/.settings/org.eclipse.jdt.core.prefs b/core/org.osate.aadl2.instantiation/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/core/org.osate.aadl2.instantiation/META-INF/MANIFEST.MF b/core/org.osate.aadl2.instantiation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance Plug-in
 Bundle-SymbolicName: org.osate.aadl2.instantiation;singleton:=true
-Bundle-Version: 1.1.4.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.osate.aadl2.instantiation.InstancePlugin
 Bundle-Vendor: CMU/SEI
@@ -18,5 +18,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)",
  org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)",
  org.osate.aadl2.contrib;bundle-version="[1.1.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.osate.aadl2.instantiation