Bug 581162 - [Releng] Update releng tools for the new p2repo

Change-Id: I5a02c6c717761dec82949de3373c2784012f646a
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

15 files changed, 28 insertions, 27 deletions

diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml
index 330570a4d1d..4c022d8c1f1 100755
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.papyrus.releng.feature"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       label="%featureName"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/pom.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/pom.xml
index d1b0ce19219..f8c77fc9fed 100755
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/pom.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<artifactId>org.eclipse.papyrus.releng.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 </project>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
index a093ce778be..66188093be3 100644
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.papyrus.toolsmiths.feature"
-      version="1.2.0.qualifier"
+      version="1.3.0.qualifier"
       label="%featureName"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/pom.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/pom.xml
index b2d3b358e5a..87e0ec2ca9e 100644
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/pom.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/pom.xml
@@ -8,6 +8,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.toolsmiths.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
index b54e9d1a416..844283ab9dc 100755
--- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.cbi.p2repo.aggregator;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.cbi.p2repo.aggregator.legacy;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.cbi.p2repo.aggregator;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.cbi.p2repo.aggregator.legacy;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.cbi.targetplatform;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.cbi.targetplatform.model;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.cbi.targetplatform.ui;bundle-version="[3.0.0,4.0.0)",
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.cbi.p2repo.aggregator;bundle-version="[1.0.0,2.0.0)"
  org.eclipse.xtext;bundle-version="[2.22.0,3.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.releng.tools.internal.Activator
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml
index c7a7d8c7c3c..3dfec1ece40 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml
@@ -10,6 +10,6 @@
 	</parent>
 	<artifactId>org.eclipse.papyrus.releng.tools</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
index 387365c5730..19d1f00cf5d 100755
--- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
+++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Main" sequenceNumber="1675247068">
+<target name="Papyrus Main" sequenceNumber="1675413534">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
index 4edeb6608ba..e2e62ca46a5 100755
--- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
+++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus RCP" sequenceNumber="1675247068">
+<target name="Papyrus RCP" sequenceNumber="1675413534">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -108,8 +108,8 @@
       <repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="6.5.0.202301111425-m1"/>
-      <repository id="egit" location="https://download.eclipse.org/egit/staging/v6.5.0.202301111425-m1"/>
+      <unit id="org.eclipse.egit.feature.group" version="6.5.0.202302011120-m2"/>
+      <repository id="egit" location="https://download.eclipse.org/egit/staging/v6.5.0.202302011120-m2"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.27.0.v20221130-2034"/>
diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
index 3baba150315..05fb7344857 100644
--- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
+++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
@@ -19,7 +19,7 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"
 
 /*** Updates from the Simrel repository ***/
 // updateFrom("EGit",0)
-location egit "https://download.eclipse.org/egit/staging/v6.5.0.202301111425-m1" {
+location egit "https://download.eclipse.org/egit/staging/v6.5.0.202302011120-m2" {
 	org.eclipse.egit.feature.group
 }
 
diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
index 565756ebfa0..a01e216146f 100755
--- a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Tests" sequenceNumber="1675247068">
+<target name="Papyrus CDO Tests" sequenceNumber="1675413534">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
diff --git a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
index 3b856e91778..5290bb6b0d2 100755
--- a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
+++ b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Tests" sequenceNumber="1675247068">
+<target name="Papyrus Tests" sequenceNumber="1675413534">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
index 25f0cfada12..69fcf1007c6 100755
--- a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
+++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Releng" sequenceNumber="1675247068">
+<target name="Papyrus Releng" sequenceNumber="1675413539">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -110,7 +110,7 @@
       <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="0.0.0"/>
-      <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/>
+      <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/p2-aggregator/tools/nightly/latest/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.oomph.version.feature.group" version="1.16.0.v20220421-1218"/>
@@ -132,7 +132,7 @@
       <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.25.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="https://download.eclipse.org/egit/staging/v6.5.0.202301111425-m1"/>
+      <repository id="egit" location="https://download.eclipse.org/egit/staging/v6.5.0.202302011120-m2"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.20.1"/>
diff --git a/releng/toolsmiths/site/category.xml b/releng/toolsmiths/site/category.xml
index 63b1f7e4a53..547ac3af4b0 100644
--- a/releng/toolsmiths/site/category.xml
+++ b/releng/toolsmiths/site/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.papyrus.toolsmiths.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature" version="1.2.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.toolsmiths.feature_1.3.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature" version="1.3.0.qualifier">
       <category name="org.eclipse.papyrus.toolsmiths.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.toolsmiths.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature.source" version="1.2.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.toolsmiths.feature.source_1.3.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature.source" version="1.3.0.qualifier">
       <category name="org.eclipse.papyrus.toolsmiths.category"/>
    </feature>
    <feature url="features/org.eclipse.papyrus.uml.assistants.feature_4.0.0.qualifier.jar" id="org.eclipse.papyrus.uml.assistants.feature" version="4.0.0.qualifier">
@@ -30,10 +30,10 @@
    <feature url="features/org.eclipse.papyrus.junit.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.junit.feature.source" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.toolsmiths.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.releng.feature_1.1.0.qualifier.jar" id="org.eclipse.papyrus.releng.feature" version="1.1.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.releng.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.releng.feature" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.releng.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.releng.feature.source_1.1.0.qualifier.jar" id="org.eclipse.papyrus.releng.feature.source" version="1.1.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.releng.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.releng.feature.source" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.releng.category"/>
    </feature>
    <feature url="features/org.eclipse.papyrus.toolsmiths.validation.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.validation.feature" version="1.0.0.qualifier">
@@ -64,5 +64,6 @@
          Papyrus tools used for releng purposes.
       </description>
    </category-def>
-   <repository-reference location="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/cbi/updates/tpd/nightly/latest" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/cbi/updates/p2-aggregator/tools/nightly/latest" enabled="true" />
 </site>
diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
index 549c864160e..b8943b17d94 100755
--- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1675257819">
+<target name="Papyrus Toolsmiths" sequenceNumber="1675413539">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -132,7 +132,7 @@
       <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.25.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="https://download.eclipse.org/egit/staging/v6.5.0.202301111425-m1"/>
+      <repository id="egit" location="https://download.eclipse.org/egit/staging/v6.5.0.202302011120-m2"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.20.1"/>
diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
index 99f7c0d31a8..9d8d17c011f 100644
--- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
+++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
@@ -39,7 +39,7 @@ location oomph "https://download.eclipse.org/oomph/drops/release/1.25.0" {
 }
 
 // updateFrom("EGit",0) 
-location egit "https://download.eclipse.org/egit/staging/v6.5.0.202301111425-m1" // oomph
+location egit "https://download.eclipse.org/egit/staging/v6.5.0.202302011120-m2" // oomph
 
 // manualUpdate
 // 2.0.5 seems to require java 17