Skip to content

Commit

Permalink
#94 Bump to 2.1.1
Browse files Browse the repository at this point in the history
Update tp
Update versions in pom and manifests

Change-Id: Ic8b974c37512200d81bd4294154814099912c5a3
Signed-off-by: Erwann Traisnel <[email protected]>
Signed-off-by: Philippe DUL <[email protected]>
  • Loading branch information
etraisnel2 authored and pdulth committed Jan 4, 2023
1 parent a876fd9 commit 876fad3
Show file tree
Hide file tree
Showing 33 changed files with 57 additions and 100 deletions.
40 changes: 0 additions & 40 deletions .gitlab-ci.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pipeline {
}

environment {
BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '')
BUILD_KEY = "6.0.0"
CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/capella"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.cybersecurity.cdo.feature"
label="%pluginName"
version="2.1.0.qualifier"
version="2.1.1.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand All @@ -29,7 +29,7 @@
</license>

<requires>
<import feature="org.polarsys.capella.cybersecurity.feature" version="2.1.0.qualifier"/>
<import feature="org.polarsys.capella.cybersecurity.feature" version="2.1.1.qualifier"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.polarsys.capella.cybersecurity.docgen.feature"
label="%pluginName"
version="2.1.0.qualifier"
version="2.1.1.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand All @@ -28,7 +28,7 @@
</license>

<requires>
<import feature="org.polarsys.capella.cybersecurity.feature" version="2.1.0.qualifier"/>
<import feature="org.polarsys.capella.cybersecurity.feature" version="2.1.1.qualifier"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.cybersecurity.feature"
label="%pluginName"
version="2.1.0.qualifier"
version="2.1.1.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 @@ -12,7 +12,7 @@
<feature
id="org.polarsys.capella.cybersecurity.tests.feature"
label="%featureName"
version="2.1.0.qualifier"
version="2.1.1.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.cybersecurity</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.cybersecurity.features</artifactId>
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: Capella Cybersecurity AF
Bundle-SymbolicName: org.polarsys.capella.cybersecurity.af;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.kitalpha.ad.viewpoint.ui
Automatic-Module-Name: org.polarsys.capella.cybersecurity.af
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: Capella Cybersecurity Business Queries
Bundle-SymbolicName: org.polarsys.capella.cybersecurity.business.queries;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Automatic-Module-Name: org.polarsys.capella.cybersecurity.business.queries
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.capella.core.data.business.queries,
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: Cybersecurity Addon Documentation
Bundle-SymbolicName: org.polarsys.capella.cybersecurity.doc;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Automatic-Module-Name: org.polarsys.capella.cybersecurity.doc
Require-Bundle: org.eclipse.help,
org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<h1 id="Installation_and_Uninstallation">Installation and Uninstallation</h1>
<p>Install Capella as described
<a href="/wiki/../help/topic/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.html" title="../help/topic/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.html">here</a><span class="github-link">
<a href="/wiki/https://github.com/eclipse/capella-cybersecurity/tree/master/plugins/org.polarsys.capella.cybersecurity.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki" title="https://github.com/eclipse/capella-cybersecurity/tree/master/plugins/org.polarsys.capella.cybersecurity.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki">(online documentation)</a></span>.
<a href="/wiki/https://github.com/eclipse/capella/tree/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki" title="https://github.com/eclipse/capella/tree/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki">(online documentation)</a></span>.
</p>
<p>To install the DARC Viewpoint read the
<a href="/wiki/../help/topic/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.html?#Configuration_and_Extensibility" title="../help/topic/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.html?#Configuration_and_Extensibility">Configuration and Extensibility</a>
<span class="github-link">
<a href="/wiki/https://github.com/eclipse/capella-cybersecurity/tree/master/plugins/org.polarsys.capella.cybersecurity.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility" title="https://github.com/eclipse/capella-cybersecurity/tree/master/plugins/org.polarsys.capella.cybersecurity.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility">(online documentation)</a></span> section.
<a href="/wiki/https://github.com/eclipse/capella/tree/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility" title="https://github.com/eclipse/capella/tree/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility">(online documentation)</a></span> section.
</p>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
-->
=Installation and Uninstallation=

Install Capella as described [[../help/topic/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.html | here]]<span class="github-link">[[https://github.com/eclipse/capella-cybersecurity/tree/master/plugins/org.polarsys.capella.cybersecurity.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki|(online documentation)]]</span>.
Install Capella as described [[../help/topic/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.html | here]]<span class="github-link">[[https://github.com/eclipse/capella/tree/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki |(online documentation)]]</span>.


To install the DARC Viewpoint read the [[../help/topic/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.html?#Configuration_and_Extensibility | Configuration and Extensibility]]
<span class="github-link">[[https://github.com/eclipse/capella-cybersecurity/tree/master/plugins/org.polarsys.capella.cybersecurity.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility|(online documentation)]]</span> section.
<span class="github-link">[[https://github.com/eclipse/capella/tree/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility |(online documentation)]]</span> section.


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: Docgen
Bundle-SymbolicName: org.polarsys.capella.cybersecurity.docgen;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Automatic-Module-Name: org.polarsys.capella.cybersecurity.docgen
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Capella Cybersecurity FC
Bundle-SymbolicName: org.polarsys.capella.cybersecurity.fc;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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.cybersecurity.helpers;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# =============================================================================

bin.includes = .,\
model/,\
models/,\
META-INF/,\
plugin.xml,\
plugin.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.cybersecurity.model.edit.decorators;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
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.cybersecurity.model.edit;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.polarsys.capella.cybersecurity.model.provider.CybersecurityEditPlugin$Implementation
Bundle-Vendor: %providerName
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.cybersecurity.model;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
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.cybersecurity.rcp;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Bundle-Vendor: %providerName
Automatic-Module-Name: org.polarsys.capella.cybersecurity.rcp
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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.cybersecurity.sirius.analysis;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Bundle-Activator: org.polarsys.capella.cybersecurity.sirius.analysis.CybersecuritySiriusAnalysisActivator
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: Cybersecurity Transition Plug-in
Bundle-SymbolicName: org.polarsys.capella.cybersecurity.transition;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Automatic-Module-Name: org.polarsys.capella.cybersecurity.validation
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.capella.core.validation,
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.cybersecurity.ui;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Automatic-Module-Name: org.polarsys.capella.cybersecurity.vp.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.kitalpha.ad.services,
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: Cybersecurity Validation Rules Plug-in
Bundle-SymbolicName: org.polarsys.capella.cybersecurity.validation;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.1.1.qualifier
Automatic-Module-Name: org.polarsys.capella.cybersecurity.validation
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.capella.core.validation,
Expand Down
2 changes: 1 addition & 1 deletion plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.cybersecurity</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.cybersecurity.plugins</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<name>Cybersecurity</name>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.cybersecurity</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<tycho-version>2.5.0</tycho-version>
<tycho-extras-version>2.5.0</tycho-extras-version>
<tycho-version>2.0.0</tycho-version>
<tycho-extras-version>2.0.0</tycho-extras-version>
<tycho.scmUrl>scm:git:http://git.polarsys.org/c/capella/capella-cybersecurity.git</tycho.scmUrl>
<antrun-version>3.0.0</antrun-version>

Expand Down Expand Up @@ -82,7 +82,7 @@
<artifact>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.cybersecurity</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>
<classifier>releng/org.polarsys.capella.cybersecurity.target/capella.target-definition</classifier>
</artifact>
</target>
Expand Down Expand Up @@ -178,7 +178,7 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
<version>1.1.5</version>
<version>1.3.2</version>
<executions>
<execution>
<id>sign</id>
Expand Down
8 changes: 4 additions & 4 deletions releng/org.polarsys.capella.cybersecurity.site/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
<description url="http://www.polarsys.org/capella">
Capella Cybersecurity
</description>
<feature id="org.polarsys.capella.cybersecurity.feature.source" version="2.1.0.qualifier">
<feature id="org.polarsys.capella.cybersecurity.feature.source" version="2.1.1.qualifier">
<category name="org.polarsys.capella.cybersecurity"/>
</feature>
<feature id="org.polarsys.capella.cybersecurity.cdo.feature.source" version="2.1.0.qualifier">
<feature id="org.polarsys.capella.cybersecurity.cdo.feature.source" version="2.1.1.qualifier">
<category name="org.polarsys.capella.cybersecurity.collaboration"/>
</feature>
<feature id="org.polarsys.capella.cybersecurity.docgen.feature.source" version="2.1.0.qualifier">
<feature id="org.polarsys.capella.cybersecurity.docgen.feature.source" version="2.1.1.qualifier">
<category name="org.polarsys.capella.cybersecurity.docgen"/>
</feature>
<feature id="org.polarsys.capella.cybersecurity.tests.feature" version="2.1.0.qualifier">
<feature id="org.polarsys.capella.cybersecurity.tests.feature" version="2.1.1.qualifier">
<category name="org.polarsys.capella.cybersecurity.tests"/>
</feature>
<category-def name="org.polarsys.capella.cybersecurity" label="Cybersecurity"/>
Expand Down
6 changes: 2 additions & 4 deletions releng/org.polarsys.capella.cybersecurity.site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.cybersecurity</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

<artifactId>org.polarsys.capella.cybersecurity.site</artifactId>
<packaging>eclipse-repository</packaging>
<version>2.1.0-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>

<build>
<plugins>
Expand Down Expand Up @@ -54,7 +54,6 @@
<type>eclipse-plugin</type>
</dependency>
</dependencies>
<executionEnvironment>JavaSE-11</executionEnvironment>
</configuration>
<executions>
<execution>
Expand All @@ -65,7 +64,6 @@
</goals>
<configuration>
<appArgLine>-application org.eclipse.equinox.p2.repository.repo2runnable -source file:${project.build.directory}/repository -destination ${project.build.directory}/${packagedAddonName}/eclipse</appArgLine>
<executionEnvironment>JavaSE-11</executionEnvironment>
</configuration>
</execution>
</executions>
Expand Down
Loading

0 comments on commit 876fad3

Please sign in to comment.