Skip to content

Commit

Permalink
Improve import and bump to v0.12.3 (#170)
Browse files Browse the repository at this point in the history
* [releng] Bump to 0.12.3

Change-Id: I116ab31e9e92414b3084d105ee8de1ba566885f7
Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com>

* #169 Keep quotes as text at import + display the attributes unescaped

* [releng] Edit target platform

Change-Id: I4a873b90cbece36ff8924d9a9003631023c95900
Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com>

Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com>
  • Loading branch information
MalinaStefaniaStoicanescu authored Aug 11, 2022
1 parent 60814d5 commit f1dad29
Show file tree
Hide file tree
Showing 104 changed files with 359 additions and 335 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pipeline {
environment {
BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '')
CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/capella"
CAPELLA_BRANCH = 'master'
CAPELLA_BRANCH = '5.x'
}

stages {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
<!--
Copyright (c) 2016, 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
-->
<feature
id="org.polarsys.capella.vp.requirements.af.feature"
label="%featureName"
version="0.12.2.qualifier"
version="0.12.3.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand All @@ -32,7 +32,7 @@
id="org.polarsys.capella.vp.requirements.af"
download-size="0"
install-size="0"
version="0.12.2.qualifier"
version="0.12.3.qualifier"
unpack="false"/>

</feature>
10 changes: 5 additions & 5 deletions features/org.polarsys.capella.vp.requirements.af.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
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:
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.3-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
<!--
Copyright (c) 2016, 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
-->
<feature
id="org.polarsys.capella.vp.requirements.cdo.feature"
label="%featureName"
version="0.12.2.qualifier"
version="0.12.3.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
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:
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.3-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.feature"
label="%featureName"
version="0.12.2.qualifier"
version="0.12.3.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
10 changes: 5 additions & 5 deletions features/org.polarsys.capella.vp.requirements.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
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:
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.3-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
<!--
Copyright (c) 2016, 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
-->
<feature
id="org.polarsys.capella.vp.requirements.importer.feature"
label="%featureName"
version="0.12.2.qualifier"
version="0.12.3.qualifier"
provider-name="%providerName">

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

<requires>
<import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.2.qualifier"/>
<import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.3.qualifier"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
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:
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.3-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
<!--
Copyright (c) 2016, 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
-->
<feature
id="org.polarsys.capella.vp.requirements.representation.feature"
label="%featureName"
version="0.12.2.qualifier"
version="0.12.3.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
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:
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.3-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.tests.feature"
label="%featureName"
version="0.12.2.qualifier"
version="0.12.3.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 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
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:
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.3-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
<!--
Copyright (c) 2016, 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
-->
<feature
id="org.polarsys.capella.vp.requirements.thirdparty.feature"
label="%featureName"
version="0.12.2.qualifier"
version="0.12.3.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 @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.3-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.ui.feature"
label="%featureName"
version="0.12.2.qualifier"
version="0.12.3.qualifier"
provider-name="%providerName">

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

<requires>
<import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.2.qualifier"/>
<import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.3.qualifier"/>
</requires>

<plugin
Expand Down
10 changes: 5 additions & 5 deletions features/org.polarsys.capella.vp.requirements.ui.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 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
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:
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.3-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Loading

0 comments on commit f1dad29

Please sign in to comment.