Skip to content

Commit

Permalink
[releng] Filtering 1.7.0
Browse files Browse the repository at this point in the history
Bump from 1.6.2 to 1.7.0

Updates in TP :
Capella 7
CDO 2023 03

Change-Id: I2792f4c3ae392e61c81f5007f2d42334880a351d
Signed-off-by: Erwann Traisnel <erwann.traisnel@obeo.fr>
  • Loading branch information
etraisnel2 authored and pdulth committed Nov 27, 2023
1 parent dab883e commit 9e669fb
Show file tree
Hide file tree
Showing 33 changed files with 46 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.polarsys.capella.filtering.cdo.feature"
label="%featureName"
version="1.6.2.qualifier"
version="1.7.0.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.polarsys.capella.filtering.feature"
label="%featureName"
version="1.6.2.qualifier"
version="1.7.0.qualifier"
provider-name="%providerName">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.polarsys.capella.filtering.tests.feature"
label="%featureName"
version="1.6.2.qualifier"
version="1.7.0.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
4 changes: 2 additions & 2 deletions features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.filtering.features</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Fc
Bundle-SymbolicName: org.polarsys.capella.filtering.fc;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Require-Bundle: org.eclipse.egf.core
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: %providerName
Bundle-Name: %pluginName
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Localization: plugin

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="Filtering" description="" id="org.polarsys.capella.filtering" vpid="_MB6moB21EeaZT-H7SsDabc" version="1.6.0">
<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="Filtering" description="" id="org.polarsys.capella.filtering" vpid="_MB6moB21EeaZT-H7SsDabc" version="1.7.0">
<ruleSet vpid="_oNyM8VQPEeas5ZJk-jBAEF" target="_MB6moB21EeaZT-H7SsDabc"/>
<serviceSet name="" description="" id="" vpid="_oNyM8FQPEeas5ZJk-jBAEF" target="_MB6moB21EeaZT-H7SsDabc"/>
<metamodel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.business.queries;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.commandline;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.polarsys.capella.core.validation.commandline.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.polarsys.capella.core.commandline.core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.doc;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.polarsys.capella.filtering.doc.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.polarsys.capella.filtering.menu.contribution;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.polarsys.capella.common.menu.dynamic,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.polarsys.capella.filtering.migration;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.polarsys.capella.filtering.migration.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.model.cdo;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.polarsys.capella.filtering.model.cdo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.filtering.model.cdo</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.model.edit;singleton:=true
Automatic-Module-Name: org.polarsys.capella.filtering.model.edit
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.polarsys.capella.filtering.provider.FilteringEditPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.polarsys.capella.filtering.model.edit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.filtering.model.edit</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.model;singleton:=true
Automatic-Module-Name: org.polarsys.capella.filtering.model
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.polarsys.capella.filtering.model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.filtering.model</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.properties;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.polarsys.capella.core.ui.properties,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.semantic.queries;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.polarsys.capella.filtering.sirius.analysis;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.polarsys.capella.filtering.sirius.analysis.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.sirius.ui;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.polarsys.capella.filtering.sirius.ui.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.tools;singleton:=true
Bundle-Localization: plugin
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.polarsys.capella.common.ui.toolkit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.polarsys.capella.filtering.transition;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.polarsys.capella.filtering.transition.Activator
Require-Bundle: org.eclipse.core.runtime,
org.polarsys.capella.common.transition,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.polarsys.capella.filtering.validation;singleton:=true
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.polarsys.capella.filtering.validation.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.validation,
Expand Down
4 changes: 2 additions & 2 deletions plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@

<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.filtering.bundles</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>

<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>

Expand All @@ -36,7 +36,7 @@
<tycho.scmUrl>scm:git:http://git.polarsys.org/c/capella/capella-filtering.git</tycho.scmUrl>

<!-- for packaging -->
<platform-name>neon</platform-name>
<platform-name>oxygen</platform-name>
<eclipse-repo.url>http://download.eclipse.org/releases/${platform-name}</eclipse-repo.url>
<packagedAddonName>Filtering</packagedAddonName>

Expand Down Expand Up @@ -86,7 +86,7 @@
<artifact>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<classifier>releng/org.polarsys.capella.filtering.update/capella.target-definition</classifier>
</artifact>
</target>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.polarsys.capella.filtering.site/category.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature id="org.polarsys.capella.filtering.feature.source" version="1.6.2.qualifier">
<feature id="org.polarsys.capella.filtering.feature.source" version="1.7.0.qualifier">
<category name="org.polarsys.capella.filtering"/>
</feature>
<feature id="org.polarsys.capella.filtering.cdo.feature.source" version="1.6.2.qualifier">
<feature id="org.polarsys.capella.filtering.cdo.feature.source" version="1.7.0.qualifier">
<category name="org.polarsys.capella.filtering.collaboration"/>
</feature>
<feature id="org.polarsys.capella.filtering.tests.feature">
Expand Down
4 changes: 2 additions & 2 deletions releng/org.polarsys.capella.filtering.site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

<artifactId>org.polarsys.capella.filtering.site</artifactId>
<packaging>eclipse-repository</packaging>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>

<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@
*******************************************************************************/
target "CapellaFiltering"

include "https://raw.githubusercontent.com/eclipse/capella/v6.1.0/releng/plugins/org.polarsys.capella.targets/full/capella.target-definition.targetplatform"
include "https://download.eclipse.org/capella/core/updates/stable/7.0.0-S20231002/targets/capella.target-definition.targetplatform"

with source, requirements

location capella-core "https://download.eclipse.org/capella/core/updates/releases/6.1.0/org.polarsys.capella.rcp.site" {
location capella-core "https://download.eclipse.org/capella/core/updates/stable/7.0.0-S20231002/org.polarsys.capella.rcp.site" {

org.polarsys.capella.rcp.feature.group
org.polarsys.capella.cdo.mock.feature.feature.group
}

location capella-tests "https://download.eclipse.org/capella/core/updates/releases/6.1.0/org.polarsys.capella.test.site" {
location capella-tests "https://download.eclipse.org/capella/core/updates/stable/7.0.0-S20231002/org.polarsys.capella.test.site" {

org.polarsys.capella.test.feature.feature.group
}

location "https://download.eclipse.org/modeling/emf/cdo/drops/R20210608-2339/" {
location "https://download.eclipse.org/modeling/emf/cdo/drops/R20230307-0126/" {
org.eclipse.emf.cdo.sdk.feature.group
}

2 changes: 1 addition & 1 deletion releng/org.polarsys.capella.filtering.update/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>org.polarsys</groupId>
<artifactId>capella.target-definition</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>

<licenses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.filtering.tests.ju
Bundle-Version: 1.6.2.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.polarsys.capella.filtering.tests.ju.activator.Activator
Require-Bundle: org.polarsys.capella.filtering.tools,
org.polarsys.capella.filtering.model,
Expand Down
4 changes: 2 additions & 2 deletions tests/org.polarsys.capella.filtering.tests.ju/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.filtering</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.filtering.tests.ju</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<sonar.skip>true</sonar.skip>
Expand Down

0 comments on commit 9e669fb

Please sign in to comment.