Skip to content

Commit

Permalink
Merge pull request #491 from ZeligsoftDev/papyruscx-3-issue-490
Browse files Browse the repository at this point in the history
Papyrus CX 3 Issue #490
  • Loading branch information
eposse authored Feb 7, 2024
2 parents 2303a4c + f23a3dd commit ca6e17a
Show file tree
Hide file tree
Showing 148 changed files with 302 additions and 236 deletions.
4 changes: 2 additions & 2 deletions bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.bundles</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions ddk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.ddk.bundles</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion features/com.zeligsoft.xtext.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.zeligsoft.xtext.feature"
label="%featureName"
version="2.6.0.qualifier"
version="3.0.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 @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/com.zeligsoft.papyrus.patch_2.6.0.qualifier.jar" id="com.zeligsoft.papyrus.patch" version="2.6.0.qualifier" patch="true">
<feature url="features/com.zeligsoft.papyrus.patch_3.0.0.qualifier.jar" id="com.zeligsoft.papyrus.patch" version="3.0.0.qualifier" patch="true">
<category name="com.zeligsoft.papyrus.patch"/>
</feature>
<category-def name="com.zeligsoft.papyrus.patch" label="Dummy category for p2 bug 262009">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.zeligsoft.papyruspatch"
label="CX4CBDDS Patch for Papyrus 4.4.0"
version="2.6.0.qualifier"
version="3.0.0.qualifier"
provider-name="Zeligsoft">

<description>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v4.4.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v440</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v4.4.0/site-papyrus-patch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-site-v440</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>

<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v440</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion papyrus-patch/v4.4.0/site-papyrus-patch/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</description>
</category-def>

<feature id="com.zeligsoft.papyruspatch" url="features/com.zeligsoft.papyruspatch_2.6.0.qualifier.jar" version="2.6.0.qualifier">
<feature id="com.zeligsoft.papyruspatch" url="features/com.zeligsoft.papyruspatch_3.0.0.qualifier.jar" version="3.0.0.qualifier">
<category name="com.zeligsoft.cx.papyruspatch"/>
</feature>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.zeligsoft.papyrus.uml.properties.patch.feature"
label="%featureName"
version="2.6.0.qualifier"
version="3.0.0.qualifier"
provider-name="%providerName">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.zeligsoft.papyrus.views.modelexplorer.patch.feature"
label="%featureName"
version="2.6.0.qualifier"
version="3.0.0.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
2 changes: 1 addition & 1 deletion papyrus-patch/v4.8.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v480</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v4.8.0/site-papyrus-patch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-site-v480</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>

<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v480</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v4.8.0/site-papyrus-patch/site.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/com.zeligsoft.papyrus.views.modelexplorer.patch.feature_2.6.0.qualifier.jar" id="com.zeligsoft.papyrus.views.modelexplorer.patch.feature" version="2.6.0.qualifier" patch="true">
<feature url="features/com.zeligsoft.papyrus.views.modelexplorer.patch.feature_3.0.0.qualifier.jar" id="com.zeligsoft.papyrus.views.modelexplorer.patch.feature" version="3.0.0.qualifier" patch="true">
<category name="com.zeligsoft.cx.papyruspatch"/>
</feature>
<feature url="features/com.zeligsoft.papyrus.uml.properties.patch.feature_2.6.0.qualifier.jar" id="com.zeligsoft.papyrus.uml.properties.patch.feature" version="2.6.0.qualifier" patch="true">
<feature url="features/com.zeligsoft.papyrus.uml.properties.patch.feature_3.0.0.qualifier.jar" id="com.zeligsoft.papyrus.uml.properties.patch.feature" version="3.0.0.qualifier" patch="true">
<category name="com.zeligsoft.cx.papyruspatch"/>
</feature>
<category-def name="com.zeligsoft.cx.papyruspatch" label="Papyrus Patch (required)">
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v6.5.0/nebula/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.nebula.features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.nebula</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v6.5.0/nebula/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.nebula.plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.nebula</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v6.5.0/nebula/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.nebula</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.zeligsoft.papyrus.infra.nattable.patch.feature"
label="%featureName"
version="2.6.0.qualifier"
version="3.0.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 @@ -2,7 +2,7 @@
<feature
id="com.zeligsoft.papyrus.uml.nattable.patch.feature"
label="%featureName"
version="2.6.0.qualifier"
version="3.0.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 @@ -2,7 +2,7 @@
<feature
id="com.zeligsoft.papyrus.uml.properties.patch.feature"
label="%featureName"
version="2.6.0.qualifier"
version="3.0.0.qualifier"
provider-name="%providerName">

<description>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v6.5.0/papyrus/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.papyrus.features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.papyrus</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v6.5.0/papyrus/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.papyrus.plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.papyrus</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v6.5.0/papyrus/plugins/uml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.papyrus.plugins.uml</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.papyrus.plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v6.5.0/papyrus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650.papyrus</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion papyrus-patch/v6.5.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions papyrus-patch/v6.5.0/site-papyrus-patch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-site-v650</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>

<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v650</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
7 changes: 4 additions & 3 deletions papyrus-patch/v6.5.0/site-papyrus-patch/site.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/com.zeligsoft.papyrus.uml.properties.patch.feature_2.6.0.qualifier.jar" id="com.zeligsoft.papyrus.uml.properties.patch.feature" version="2.6.0.qualifier" patch="true">
<feature url="features/com.zeligsoft.papyrus.uml.properties.patch.feature_3.0.0.qualifier.jar" id="com.zeligsoft.papyrus.uml.properties.patch.feature" version="3.0.0.qualifier" patch="true">
<category name="com.zeligsoft.cx.papyruspatch"/>
</feature>
<feature url="features/com.zeligsoft.papyrus.infra.nattable.patch.feature_2.6.0.qualifier.jar" id="com.zeligsoft.papyrus.infra.nattable.patch.feature" version="2.6.0.qualifier" patch="true">
<feature url="features/com.zeligsoft.papyrus.infra.nattable.patch.feature_3.0.0.qualifier.jar" id="com.zeligsoft.papyrus.infra.nattable.patch.feature" version="3.0.0.qualifier" patch="true">
<category name="com.zeligsoft.cx.papyruspatch"/>
</feature>
<feature url="features/com.zeligsoft.papyrus.uml.nattable.patch.feature_2.6.0.qualifier.jar" id="com.zeligsoft.papyrus.uml.nattable.patch.feature" version="2.6.0.qualifier" patch="true">
<feature url="features/com.zeligsoft.papyrus.uml.nattable.patch.feature_3.0.0.qualifier.jar" id="com.zeligsoft.papyrus.uml.nattable.patch.feature" version="3.0.0.qualifier" patch="true">
<category name="com.zeligsoft.cx.papyruspatch"/>
</feature>
<category-def name="com.zeligsoft.cx.papyruspatch" label="Papyrus Patch (required)">
Expand All @@ -15,3 +15,4 @@
</description>
</category-def>
</site>
^
4 changes: 2 additions & 2 deletions patches/apache/ant/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.patches.apache.ant.features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.patches.apache.ant</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion patches/apache/ant/plugins/org.apache.ant/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.patches.apache.ant.plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>org.apache.ant</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions patches/apache/ant/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.patches.apache.ant.plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>com.zeligsoft.dds4ccm</groupId>
<artifactId>com.zeligsoft.dds4ccm.patches.apache.ant</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
Loading

0 comments on commit ca6e17a

Please sign in to comment.