[releng] Bump to 1.6.4

Update target platform to include Sirius 7.1.0 release Change-Id: I049960807bd8444ab4af4a13b9f8b3125a5e27ad Signed-off-by: Erwann Traisnel <[email protected]>
eclipse-capella · Sep 28, 2023 · 4a3bc3d · 4a3bc3d
1 parent d3562fe
commit 4a3bc3d
Show file tree

Hide file tree

Showing 20 changed files with 164 additions and 26 deletions.
diff --git a/features/org.polarsys.capella.transition.system2subsystem.feature/feature.xml b/features/org.polarsys.capella.transition.system2subsystem.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.polarsys.capella.transition.system2subsystem.feature"
       label="%featureName"
-      version="1.6.3.qualifier"
+      version="1.6.4.qualifier"
       provider-name="%providerName">
 
    <description>

diff --git a/features/org.polarsys.capella.transition.system2subsystem.tests.feature/feature.xml b/features/org.polarsys.capella.transition.system2subsystem.tests.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.polarsys.capella.transition.system2subsystem.tests.feature"
       label="%featureName"
-      version="1.6.3.qualifier"
+      version="1.6.4.qualifier"
       provider-name="%providerName">
 
    <description>

diff --git a/features/pom.xml b/features/pom.xml
@@ -18,13 +18,13 @@
 
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.transition.system2subsystem.features</artifactId>
-	<version>1.6.3-SNAPSHOT</version>
+	<version>1.6.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.transition.system2subsystem</artifactId>
-		<version>1.6.3-SNAPSHOT</version>
+		<version>1.6.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.capella.transition.system2subsystem.ui;visibility:=reexport
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.crossphases.ui.Activator

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.capella.core.data.business.queries
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.crossphases.Activator

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.doc/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.doc;singleton:=true
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.doc.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.capella.transition.system2subsystem.ui;visibility:=reexport
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.interphases.ui.Activator

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.capella.transition.system2subsystem;visibility:=reexport
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Name: %pluginName
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.interphases.Activator
 Bundle-Localization: plugin

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.multiphases.ui;singleton:=true
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.multiphases.ui.MultiphasesUIActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.multiphases;singleton:=true
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.multiphases.MultiphasesActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.tests.ju;singleton:=true
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.tests.System2SubsystemTestActivator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.osgi.util,

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/pom.xml b/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.transition.system2subsystem</artifactId>
-		<version>1.6.3-SNAPSHOT</version>
+		<version>1.6.4-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
@@ -30,7 +30,7 @@
 
 	<artifactId>org.polarsys.capella.transition.system2subsystem.tests.ju</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>1.6.3-SNAPSHOT</version>
+	<version>1.6.4-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.diffmerge.ui
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.ui.Activator

diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem/META-INF/MANIFEST.MF
@@ -36,7 +36,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.capella.core.compare
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.6.3.qualifier
+Bundle-Version: 1.6.4.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.polarsys.capella.transition.system2subsystem.Activator

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -18,13 +18,13 @@
 
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.transition.system2subsystem.bundles</artifactId>
-	<version>1.6.3-SNAPSHOT</version>
+	<version>1.6.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.transition.system2subsystem</artifactId>
-		<version>1.6.3-SNAPSHOT</version>
+		<version>1.6.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <name>Capella Subsystem Transition</name>
   <groupId>org.polarsys</groupId>
   <artifactId>org.polarsys.capella.addon.transition.system2subsystem</artifactId>
-  <version>1.6.3-SNAPSHOT</version>
+  <version>1.6.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -86,7 +86,7 @@
 				<artifact>
 					<groupId>org.polarsys</groupId>
 					<artifactId>org.polarsys.capella.addon.transition.system2subsystem</artifactId>
-					<version>1.6.3-SNAPSHOT</version>
+					<version>1.6.4-SNAPSHOT</version>
 					<classifier>releng/org.polarsys.capella.transition.system2subsystem.target/tp/capella.target-definition</classifier>
 				</artifact>
 			</target>

diff --git a/releng/org.polarsys.capella.transition.system2subsystem.site/category.xml b/releng/org.polarsys.capella.transition.system2subsystem.site/category.xml
@@ -3,10 +3,10 @@
    <description url="http://www.polarsys.org/capella">
       Capella Subsystem Transition
    </description>
-   <feature id="org.polarsys.capella.transition.system2subsystem.feature.source" version="1.6.3.qualifier">
+   <feature id="org.polarsys.capella.transition.system2subsystem.feature.source" version="1.6.4.qualifier">
       <category name="org.polarsys.capella.transition.system2subsystem"/>
    </feature>
-   <feature id="org.polarsys.capella.transition.system2subsystem.tests.feature" version="1.6.3.qualifier">
+   <feature id="org.polarsys.capella.transition.system2subsystem.tests.feature" version="1.6.4.qualifier">
       <category name="org.polarsys.capella.transition.system2subsystem.tests"/>
    </feature>
    <category-def name="org.polarsys.capella.transition.system2subsystem" label="Capella Subsystem Transition"/>

diff --git a/releng/org.polarsys.capella.transition.system2subsystem.site/pom.xml b/releng/org.polarsys.capella.transition.system2subsystem.site/pom.xml
@@ -18,13 +18,13 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.transition.system2subsystem</artifactId>
-		<version>1.6.3-SNAPSHOT</version>
+		<version>1.6.4-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
 	<artifactId>org.polarsys.capella.transition.system2subsystem.site</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>1.6.3-SNAPSHOT</version>
+	<version>1.6.4-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/releng/org.polarsys.capella.transition.system2subsystem.target/pom.xml b/releng/org.polarsys.capella.transition.system2subsystem.target/pom.xml
@@ -17,7 +17,7 @@
 
 	<groupId>org.polarsys</groupId>
 	<artifactId>capella.target-definition</artifactId>
-	<version>1.6.3-SNAPSHOT</version>
+	<version>1.6.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<licenses>

diff --git a/...ys.capella.transition.system2subsystem.target/tp/capella.target-definition.targetplatform b/...ys.capella.transition.system2subsystem.target/tp/capella.target-definition.targetplatform
@@ -10,10 +10,148 @@
  *******************************************************************************/
 target "CapellaSubsystemTransition"
 
-include "https://download.eclipse.org/capella/core/updates/releases/6.1.0/targets/capella.target-definition.targetplatform"
+/* 
+ * Following include directive is commented because sirius stable 7.1.0-S20230302-034329 is not available anymore
+ * include "https://download.eclipse.org/capella/core/updates/releases/6.1.0/targets/capella.target-definition.targetplatform"
+ */
+
+/*
+ * =======================================
+ * Remove this when capella target platform gets stable versions
+ * =======================================
+ */
 
 with source, requirements
 
+/*
+ * Make sure that GMF, GEF below are consistent with the GMF used by Sirius
+ * include "https://download.eclipse.org/sirius/updates/stable/7.1.0-S20230302-034329/2021-06/targets/modules/gmf-runtime-1.15.tpd"
+ */
+location GMF-Notation-1.13.1 "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" {
+    org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
+}
+
+location GMF-Runtime-1.15.3 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/" {
+    org.eclipse.gmf.runtime.sdk.feature.group lazy
+    org.eclipse.gmf.runtime.thirdparty.feature.group lazy
+}
+
+location GEF-Classic  "https://download.eclipse.org/tools/gef/classic/releases/3.15.0" {
+    org.eclipse.gef.feature.group lazy
+	org.eclipse.gef.source.feature.group
+    org.eclipse.gef.sdk.feature.group lazy
+    org.eclipse.draw2d.sdk.feature.group lazy
+	org.eclipse.draw2d.source.feature.group
+}
+
+location eclipse "http://download.eclipse.org/releases/2021-06" {
+	org.eclipse.sdk.feature.group
+	org.eclipse.platform.feature.group
+	org.eclipse.emf.sdk.feature.group
+	org.eclipse.emf.validation.source.feature.group
+	org.eclipse.emf.transaction.source.feature.group
+	org.eclipse.emf.workspace.source.feature.group
+	org.eclipse.equinox.executable.feature.group
+	com.ibm.icu
+	org.eclipse.viatra.query.sdk.feature.source.feature.group
+	org.eclipse.jgit.source.feature.group
+	org.eclipse.egit.mylyn.feature.group
+	org.eclipse.egit.source.feature.group
+	org.eclipse.mylyn_feature.feature.group
+	org.eclipse.mylyn.commons.feature.group
+	org.eclipse.mylyn.context_feature.feature.group
+	org.eclipse.mylyn.monitor.feature.group
+	org.eclipse.mylyn.team_feature.feature.group
+	org.eclipse.mylyn.ide_feature.feature.group
+	org.eclipse.mylyn.help.ui
+	org.apache.log4j
+	org.apache.commons.lang
+	com.google.guava
+	ch.qos.logback.slf4j
+}
+
+location Xerces-2.12.2 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739" {
+	org.apache.xerces
+}
+
+location sirius "https://download.eclipse.org/sirius/updates/releases/7.1.0/2021-06" {
+	org.eclipse.sirius.doc.feature.feature.group
+	org.eclipse.sirius.doc.feature.source.feature.group
+	org.eclipse.sirius.runtime.source.feature.group
+	org.eclipse.sirius.runtime.aql.source.feature.group
+	org.eclipse.sirius.runtime.ide.ui.source.feature.group
+	org.eclipse.sirius.interpreter.feature.source.feature.group
+	org.eclipse.acceleo.ui.interpreter.source.feature.group
+	org.eclipse.sirius.aql.source.feature.group
+	org.eclipse.acceleo.query.source.feature.group
+	org.eclipse.sirius.runtime.ide.ui.acceleo.source.feature.group
+}
+
+location kitalpha-runtime-core-master "https://download.eclipse.org/kitalpha/updates/stable/runtime/6.1.0.20230322/" {
+	org.polarsys.kitalpha.ad.runtime.feature.source.feature.group
+	org.polarsys.kitalpha.cadence.feature.source.feature.group
+	org.polarsys.kitalpha.common.feature.source.feature.group
+	org.polarsys.kitalpha.emde.feature.source.feature.group
+	org.polarsys.kitalpha.emde.ui.feature.source.feature.group
+	org.polarsys.kitalpha.massactions.feature.source.feature.group
+	org.polarsys.kitalpha.model.common.share.feature.source.feature.group
+	org.polarsys.kitalpha.model.common.commands.feature.source.feature.group
+	org.polarsys.kitalpha.model.common.scrutiny.feature.source.feature.group
+	org.polarsys.kitalpha.model.detachment.contrib.viewpoints.feature.source.feature.group
+	org.polarsys.kitalpha.model.detachment.feature.source.feature.group
+	org.polarsys.kitalpha.model.detachment.ui.feature.source.feature.group
+	org.polarsys.kitalpha.report.feature.source.feature.group
+	org.polarsys.kitalpha.report.ui.feature.source.feature.group
+	org.polarsys.kitalpha.resourcereuse.emfscheme.feature.source.feature.group
+	org.polarsys.kitalpha.resourcereuse.emfscheme.ui.feature.source.feature.group
+	org.polarsys.kitalpha.resourcereuse.feature.source.feature.group
+	org.polarsys.kitalpha.resourcereuse.ui.feature.source.feature.group
+	org.polarsys.kitalpha.richtext.widget.feature.source.feature.group
+	org.polarsys.kitalpha.richtext.widget.ext.feature.source.feature.group
+	org.polarsys.kitalpha.transposer.feature.source.feature.group
+	org.polarsys.kitalpha.sirius.rotativeimage.feature.feature.group
+}
+
+location kitalpha-sdk-master "https://download.eclipse.org/kitalpha/updates/stable/sdk/6.1.0.20230322/" {
+	org.polarsys.kitalpha.doc.feature.feature.group
+	org.polarsys.kitalpha.emde.sdk.feature.source.feature.group
+}
+
+location diffmerge-core "https://download.eclipse.org/diffmerge/stable/0.14.1-S20230321/emf-diffmerge-site/" {
+	org.eclipse.emf.diffmerge.feature.source.feature.group
+	org.eclipse.emf.diffmerge.sirius.feature.source.feature.group
+	org.eclipse.emf.diffmerge.gmf.feature.source.feature.group
+	org.eclipse.emf.diffmerge.sdk.feature.source.feature.group
+	org.eclipse.emf.diffmerge.egit.feature.source.feature.group
+}
+
+location amalgam "https://download.eclipse.org/modeling/amalgam/updates/releases/1.13.0/capella/" {
+	org.eclipse.amalgam.explorer.activity.source.feature.group
+}
+
+location egf "https://download.eclipse.org/egf/updates/stable/1.6.3/2021-06/" {
+	org.eclipse.egf.sdk.feature.source.feature.group
+} 
+
+location Nattable "https://download.eclipse.org/nattable/releases/2.0.1/repository/" {
+	org.eclipse.nebula.widgets.nattable.core.feature.feature.group lazy
+	org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group lazy
+}
+
+location nebula "http://download.eclipse.org/nebula/releases/2.3.0/" {
+	org.eclipse.nebula.widgets.richtext.feature.feature.group
+}
+
+location eclipse-shared-license "http://download.eclipse.org/cbi/updates/license" {
+	org.eclipse.license.feature.group lazy
+}
+
+/*
+ * =======================================
+ * Remove this when capella target platform gets stable versions
+ * =======================================
+ */
+
 location capella-6.1 "https://download.eclipse.org/capella/core/updates/releases/6.1.0/org.polarsys.capella.rcp.site" {
 	org.polarsys.capella.rcp.feature.group
 }