Merge pull request #482 from ZeligsoftDev/streams/v2.5.x-maintenance-…

…pre-merge Issue #481: Roll version of new streams/v2.5.x-maintenance branch to 2.5.1
ZeligsoftDev · Nov 8, 2023 · 6f2d17f · 6f2d17f
2 parents 4913079 + ef1c552
commit 6f2d17f
Show file tree

Hide file tree

Showing 29 changed files with 41 additions and 41 deletions.
diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zeligsoft.dds4ccm</groupId>
 	<artifactId>com.zeligsoft.dds4ccm.bundles</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 
 	<modules>

diff --git a/ddk/pom.xml b/ddk/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zeligsoft.dds4ccm</groupId>
 	<artifactId>com.zeligsoft.ddk.bundles</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 
 	<modules>

diff --git a/features/pom.xml b/features/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zeligsoft.dds4ccm</groupId>
 	<artifactId>com.zeligsoft.dds4ccm.features</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 
 	<modules>

diff --git a/papyrus-patch/v4.4.0/feature-com.zeligsoft.papyruspatch/category.xml b/papyrus-patch/v4.4.0/feature-com.zeligsoft.papyruspatch/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.zeligsoft.papyrus.patch_2.5.0.qualifier.jar" id="com.zeligsoft.papyrus.patch" version="2.5.0.qualifier" patch="true">
+   <feature url="features/com.zeligsoft.papyrus.patch_2.5.1.qualifier.jar" id="com.zeligsoft.papyrus.patch" version="2.5.1.qualifier" patch="true">
       <category name="com.zeligsoft.papyrus.patch"/>
    </feature>
    <category-def name="com.zeligsoft.papyrus.patch" label="Dummy category for p2 bug 262009">

diff --git a/papyrus-patch/v4.4.0/feature-com.zeligsoft.papyruspatch/feature.xml b/papyrus-patch/v4.4.0/feature-com.zeligsoft.papyruspatch/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.zeligsoft.papyruspatch"
       label="CX4CBDDS Patch for Papyrus 4.4.0"
-      version="2.5.0.qualifier"
+      version="2.5.1.qualifier"
       provider-name="Zeligsoft">
 
    <description>

diff --git a/papyrus-patch/v4.4.0/pom.xml b/papyrus-patch/v4.4.0/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zeligsoft.dds4ccm</groupId>
 	<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v440</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 

diff --git a/papyrus-patch/v4.4.0/site-papyrus-patch/pom.xml b/papyrus-patch/v4.4.0/site-papyrus-patch/pom.xml
@@ -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.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>eclipse-update-site</packaging>
 
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v440</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 
 	<build>

diff --git a/papyrus-patch/v4.4.0/site-papyrus-patch/site.xml b/papyrus-patch/v4.4.0/site-papyrus-patch/site.xml
@@ -8,7 +8,7 @@
       </description>
    </category-def>
 
-   <feature id="com.zeligsoft.papyruspatch" url="features/com.zeligsoft.papyruspatch_2.5.0.qualifier.jar" version="2.5.0.qualifier">
+   <feature id="com.zeligsoft.papyruspatch" url="features/com.zeligsoft.papyruspatch_2.5.1.qualifier.jar" version="2.5.1.qualifier">
       <category name="com.zeligsoft.cx.papyruspatch"/>
    </feature>
 

diff --git a/papyrus-patch/v4.8.0/com.zeligsoft.papyrus.uml.properties.patch.feature/feature.xml b/papyrus-patch/v4.8.0/com.zeligsoft.papyrus.uml.properties.patch.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.zeligsoft.papyrus.uml.properties.patch.feature"
       label="%featureName"
-      version="2.5.0.qualifier"
+      version="2.5.1.qualifier"
       provider-name="%providerName">
 
    <description>

diff --git a/papyrus-patch/v4.8.0/com.zeligsoft.papyrus.views.modelexplorer.patch.feature/feature.xml b/papyrus-patch/v4.8.0/com.zeligsoft.papyrus.views.modelexplorer.patch.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.zeligsoft.papyrus.views.modelexplorer.patch.feature"
       label="%featureName"
-      version="2.5.0.qualifier"
+      version="2.5.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">

diff --git a/papyrus-patch/v4.8.0/pom.xml b/papyrus-patch/v4.8.0/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zeligsoft.dds4ccm</groupId>
 	<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v480</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>

diff --git a/papyrus-patch/v4.8.0/site-papyrus-patch/pom.xml b/papyrus-patch/v4.8.0/site-papyrus-patch/pom.xml
@@ -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.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>eclipse-update-site</packaging>
 
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.papyrus-patch-v480</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 
 	<build>

diff --git a/papyrus-patch/v4.8.0/site-papyrus-patch/site.xml b/papyrus-patch/v4.8.0/site-papyrus-patch/site.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.zeligsoft.papyrus.views.modelexplorer.patch.feature_2.5.0.qualifier.jar" id="com.zeligsoft.papyrus.views.modelexplorer.patch.feature" version="2.5.0.qualifier" patch="true">
+   <feature url="features/com.zeligsoft.papyrus.views.modelexplorer.patch.feature_2.5.1.qualifier.jar" id="com.zeligsoft.papyrus.views.modelexplorer.patch.feature" version="2.5.1.qualifier" patch="true">
       <category name="com.zeligsoft.cx.papyruspatch"/>
    </feature>
-   <feature url="features/com.zeligsoft.papyrus.uml.properties.patch.feature_2.5.0.qualifier.jar" id="com.zeligsoft.papyrus.uml.properties.patch.feature" version="2.5.0.qualifier" patch="true">
+   <feature url="features/com.zeligsoft.papyrus.uml.properties.patch.feature_2.5.1.qualifier.jar" id="com.zeligsoft.papyrus.uml.properties.patch.feature" version="2.5.1.qualifier" patch="true">
       <category name="com.zeligsoft.cx.papyruspatch"/>
    </feature>
    <category-def name="com.zeligsoft.cx.papyruspatch" label="Papyrus Patch (required)">

diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zeligsoft.dds4ccm</groupId>
 	<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.configuration</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 		<relativePath>./releng/com.zeligsoft.dds4ccm.configuration</relativePath>
 	</parent>
 

diff --git a/releng/com.zeligsoft.ddk.update/pom.xml b/releng/com.zeligsoft.ddk.update/pom.xml
@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.zeligsoft.ddk.update</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<build>

diff --git a/releng/com.zeligsoft.dds4ccm.configuration/pom.xml b/releng/com.zeligsoft.dds4ccm.configuration/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zeligsoft.dds4ccm</groupId>
 	<artifactId>com.zeligsoft.dds4ccm.configuration</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>

diff --git a/releng/com.zeligsoft.dds4ccm.update.atcd/pom.xml b/releng/com.zeligsoft.dds4ccm.update.atcd/pom.xml
@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.zeligsoft.dds4ccm.update.atcd</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<build>

diff --git a/releng/com.zeligsoft.dds4ccm.update.atcd/rpm_build/zeligsoftCX_atcd.spec b/releng/com.zeligsoft.dds4ccm.update.atcd/rpm_build/zeligsoftCX_atcd.spec
@@ -1,5 +1,5 @@
 %define ifdef()   	%if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
-%define ver       	2.5.0
+%define ver       	2.5.1
 %define _defaultRel	0.%(date "+%y%m%d%H%M")
 %define _rpmdir   	%{_projectdir}/rpm_build/
 %define _targetdir 	%{_projectdir}/target

diff --git a/releng/com.zeligsoft.dds4ccm.update.axcioma/pom.xml b/releng/com.zeligsoft.dds4ccm.update.axcioma/pom.xml
@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.zeligsoft.dds4ccm.update.axcioma</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<build>

diff --git a/releng/com.zeligsoft.dds4ccm.update.axcioma/rpm_build/zeligsoftCX_axcioma.spec b/releng/com.zeligsoft.dds4ccm.update.axcioma/rpm_build/zeligsoftCX_axcioma.spec
@@ -1,5 +1,5 @@
 %define ifdef()      %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
-%define ver          2.5.0
+%define ver          2.5.1
 %define _defaultRel  0.%(date "+%y%m%d%H%M")
 %define _rpmdir      %{_projectdir}/rpm_build/
 %define _targetdir   %{_projectdir}/target

diff --git a/releng/com.zeligsoft.papyrus-cx.axcioma.rcp.feature/feature.xml b/releng/com.zeligsoft.papyrus-cx.axcioma.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.zeligsoft.papyrus-cx.axcioma.rcp.feature"
       label="%featureName"
-      version="2.5.0.qualifier"
+      version="2.5.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">

diff --git a/releng/com.zeligsoft.papyrus-cx.axcioma.rcp.product/papyrus-cx-axcioma.product b/releng/com.zeligsoft.papyrus-cx.axcioma.rcp.product/papyrus-cx-axcioma.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Papyrus CX for AXCIOMA" uid="com.zeligsoft.papyrus-cx.axcioma.rcp.product" id="com.zeligsoft.papyrus-cx.axcioma.rcp.product" application="org.eclipse.ui.ide.workbench" version="2.2.0" useFeatures="true" includeLaunchers="true">
+<product name="Papyrus CX for AXCIOMA" uid="com.zeligsoft.papyrus-cx.axcioma.rcp.product" id="com.zeligsoft.papyrus-cx.axcioma.rcp.product" application="org.eclipse.ui.ide.workbench" version="2.5.1" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/releng/com.zeligsoft.papyrus-cx.axcioma.rcp.product/pom.xml b/releng/com.zeligsoft.papyrus-cx.axcioma.rcp.product/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 	<packaging>eclipse-repository</packaging>
 	<properties>

diff --git a/releng/com.zeligsoft.papyrus-cx.axcioma.rcp.product/rpm_build/papyrus-cx-axcioma.spec b/releng/com.zeligsoft.papyrus-cx.axcioma.rcp.product/rpm_build/papyrus-cx-axcioma.spec
@@ -1,5 +1,5 @@
 %define ifdef()       		%if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
-%define _default_version	2.5.0
+%define _default_version	2.5.1
 %define _default_release	0.%(date "+%Y%m%d%H%M")
 %define _rpmdir				%{_projectdir}/rpm_build/
 %define _targetdir			%{_projectdir}/target/

diff --git a/releng/com.zeligsoft.papyrus-cx.axcioma.rcp/META-INF/MANIFEST.MF b/releng/com.zeligsoft.papyrus-cx.axcioma.rcp/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.zeligsoft.papyrus-cx.axcioma.rcp;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.5.1.qualifier
 Bundle-Vendor: %providerName
 Automatic-Module-Name: com.zeligsoft.papyruscx.rcp
diff --git a/releng/com.zeligsoft.papyrus-cx.axcioma.rcp/about.mappings b/releng/com.zeligsoft.papyrus-cx.axcioma.rcp/about.mappings
@@ -5,4 +5,4 @@
 
 #0=@eclipse.simultaneous.release.build@
 #1=@eclipse.simultaneous.release.name@
-1=2.5.0
+1=2.5.1
diff --git a/releng/com.zeligsoft.papyrus-cx.axcioma.rcp/plugin.properties b/releng/com.zeligsoft.papyrus-cx.axcioma.rcp/plugin.properties
@@ -2,7 +2,7 @@ pluginName = Papyrus CX for AXCIOMA (RCP)
 providerName = Zeligsoft (2009) Limited
 aboutText=Papyrus CX for AXCIOMA\n\
 \n\
-Version: 2.5.0\n\
+Version: 2.5.1\n\
 \n\
 Copyright (c) 2022 Zeligsoft/Lumenix, and others.\n\
 \n\

diff --git a/releng/com.zeligsoft.papyrus-cx.axcioma.rcp/plugin.xml b/releng/com.zeligsoft.papyrus-cx.axcioma.rcp/plugin.xml
@@ -50,7 +50,7 @@
           </property>
           <property
                 name="aboutText"
-                value="Papyrus CX for AXCIOMA&#x0A;&#x0A;Version: 2.5.0&#x0A;&#x0A;(c) Copyright Zeligsoft/Lumenix 2022. All rights reserved.&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://www.apache.org/">
+                value="Papyrus CX for AXCIOMA&#x0A;&#x0A;Version: 2.5.1&#x0A;&#x0A;(c) Copyright Zeligsoft/Lumenix 2022. All rights reserved.&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://www.apache.org/">
           </property>
           <property
                name="windowImages"

diff --git a/releng/pom.xml b/releng/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zeligsoft.dds4ccm</groupId>
 	<artifactId>com.zeligsoft.dds4ccm.releng</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>com.zeligsoft.dds4ccm</groupId>
 		<artifactId>com.zeligsoft.dds4ccm.root</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.5.1-SNAPSHOT</version>
 	</parent>
 
 	<modules>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ @@
     #0=@eclipse.simultaneous.release.build@
     #1=@eclipse.simultaneous.release.name@
-=2.5.0
+=2.5.1