use two separate pom (update-site and rcp)

marcadetd · marcadetd · commit b607bd4f5531 · 2025-07-01T12:12:39.000+02:00
and use released versions
diff --git a/.github/workflows/Deploy-As-P2-Update-Site.yml b/.github/workflows/Deploy-As-P2-Update-Site.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Build with Maven
       run: |
         cd ${{ github.event.repository.name }}
-        mvn --batch-mode verify
+        mvn --file pom_update_site.xml --batch-mode verify
 
     - name: Upload flat p2 update site
       if: github.ref == 'refs/heads/master'
diff --git a/.github/workflows/Deploy-Snapshot-Products.yml b/.github/workflows/Deploy-Snapshot-Products.yml
@@ -115,7 +115,7 @@ jobs:
     - name: Build rcp
       run: |
         cd ${{ github.event.repository.name }}
-        mvn --batch-mode verify -Pdeploy-snapshots
+        mvn --file pom_rcp.xml --batch-mode verify -Pdeploy-snapshots
     
     - name: upload macos products
       uses: actions/upload-artifact@v4
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cgmes-3.feature/feature.xml b/fr.centralesupelec.edf.riseclipse.cim.cgmes-3.feature/feature.xml
@@ -22,7 +22,7 @@
 <feature
       id="fr.centralesupelec.edf.riseclipse.cim.cgmes-3.feature"
       label="%featureName"
-      version="1.0.3.qualifier"
+      version="1.0.2"
       provider-name="%providerName">
 
    <description>
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cgmes-3.feature/pom.xml b/fr.centralesupelec.edf.riseclipse.cim.cgmes-3.feature/pom.xml
@@ -29,14 +29,14 @@
  
   <groupId>io.github.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.cim.cgmes-3.feature</artifactId>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.2</version>
   <packaging>eclipse-feature</packaging>
   <name>[feature] RiseClipse Metamodel CGMES 3.0.0</name>
   
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>riseclipse-distribution</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <!-- RiseClipse plugins needed -->
@@ -45,43 +45,43 @@
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
-      <version>1.2.13-SNAPSHOT</version>
+      <version>1.2.12</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.cim.headerModel</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.cim.headerModel.edit</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.cim.util</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.cim.cgmes-v3.0.0</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.cim.cgmes-v3.0.0.edit</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.cim.cgmes-v3.0.0.utilities</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     
   </dependencies>
diff --git a/fr.centralesupelec.edf.riseclipse.editor.feature/feature.xml b/fr.centralesupelec.edf.riseclipse.editor.feature/feature.xml
@@ -22,7 +22,7 @@
 <feature
       id="fr.centralesupelec.edf.riseclipse.editor.feature"
       label="%featureName"
-      version="1.2.1.qualifier"
+      version="1.2.2"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
diff --git a/fr.centralesupelec.edf.riseclipse.editor.feature/pom.xml b/fr.centralesupelec.edf.riseclipse.editor.feature/pom.xml
@@ -29,14 +29,14 @@
  
   <groupId>io.github.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.editor.feature</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.2</version>
   <packaging>eclipse-feature</packaging>
   <name>[feature] RiseClipse Application - Editor</name>
   
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>riseclipse-distribution</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <build>
@@ -58,13 +58,13 @@
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.editor</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
-      <version>1.2.13-SNAPSHOT</version>
+      <version>1.2.12</version>
     </dependency>
   </dependencies>
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.feature/feature.xml b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.feature/feature.xml
@@ -22,7 +22,7 @@
 <feature
       id="fr.centralesupelec.edf.riseclipse.iec61850.nsd.feature"
       label="%featureName"
-      version="1.2.13.qualifier"
+      version="1.2.12"
       provider-name="%providerName">
 
    <description>
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.feature/pom.xml b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.feature/pom.xml
@@ -29,14 +29,14 @@
  
   <groupId>io.github.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.nsd.feature</artifactId>
-  <version>1.2.13-SNAPSHOT</version>
+  <version>1.2.12</version>
   <packaging>eclipse-feature</packaging>
   <name>[feature] RiseClipse Metamodel NSD2016</name>
   
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>riseclipse-distribution</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <!-- RiseClipse plugins needed -->
@@ -45,25 +45,25 @@
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
-      <version>1.2.13-SNAPSHOT</version>
+      <version>1.2.12</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.nsd</artifactId>
-      <version>1.2.13-SNAPSHOT</version>
+      <version>1.2.12</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit</artifactId>
-      <version>1.2.13-SNAPSHOT</version>
+      <version>1.2.12</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.nsd.utilities</artifactId>
-      <version>1.2.13-SNAPSHOT</version>
+      <version>1.2.12</version>
     </dependency>
     
   </dependencies>
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.feature/feature.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl.feature/feature.xml
@@ -22,7 +22,7 @@
 <feature
       id="fr.centralesupelec.edf.riseclipse.iec61850.scl.feature"
       label="%featureName"
-      version="1.2.16.qualifier"
+      version="1.2.15"
       provider-name="%providerName">
 
    <description>
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.feature/pom.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl.feature/pom.xml
@@ -29,14 +29,14 @@
  
   <groupId>io.github.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.feature</artifactId>
-  <version>1.2.16-SNAPSHOT</version>
+  <version>1.2.15</version>
   <packaging>eclipse-feature</packaging>
   <name>[feature] RiseClipse Metamodel SCL2003</name>
   
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>riseclipse-distribution</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <!-- RiseClipse plugins needed -->
@@ -45,25 +45,25 @@
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
-      <version>1.2.13-SNAPSHOT</version>
+      <version>1.2.12</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl</artifactId>
-      <version>1.2.16-SNAPSHOT</version>
+      <version>1.2.15</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.edit</artifactId>
-      <version>1.2.16-SNAPSHOT</version>
+      <version>1.2.15</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities</artifactId>
-      <version>1.2.16-SNAPSHOT</version>
+      <version>1.2.15</version>
     </dependency>
     
   </dependencies>
diff --git a/fr.centralesupelec.edf.riseclipse.rcp.product/fr.centralesupelec.edf.riseclipse.iec61850.rcp.product b/fr.centralesupelec.edf.riseclipse.rcp.product/fr.centralesupelec.edf.riseclipse.iec61850.rcp.product
@@ -21,7 +21,7 @@
 **      https://riseclipse.github.io
 *************************************************************************
 -->
-<product name="RiseClipse_IEC61850_Application" uid="fr.centralesupelec.edf.riseclipse.iec61850.rcp.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="1.2.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="RiseClipse_IEC61850_Application" uid="fr.centralesupelec.edf.riseclipse.iec61850.rcp.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="1.2.1" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="/fr.centralesupelec.edf.riseclipse.rcp/icons/riseclipse_lg.png"/>
diff --git a/fr.centralesupelec.edf.riseclipse.rcp.product/pom.xml b/fr.centralesupelec.edf.riseclipse.rcp.product/pom.xml
@@ -29,14 +29,14 @@
  
   <groupId>io.github.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.rcp.product</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1</version>
   <packaging>eclipse-repository</packaging>
   <name>[application] RiseClipse 61850 Application</name>
   
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>riseclipse-distribution</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <properties>
diff --git a/fr.centralesupelec.edf.riseclipse.rcp.target/fr.centralesupelec.edf.riseclipse.rcp.target b/fr.centralesupelec.edf.riseclipse.rcp.target/fr.centralesupelec.edf.riseclipse.rcp.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="RiseClipse RCP" sequenceNumber="1737989841">
+<target name="RiseClipse RCP" sequenceNumber="1751364427">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.commons.cli" version="1.9.0"/>
diff --git a/fr.centralesupelec.edf.riseclipse.rcp.target/fr.centralesupelec.edf.riseclipse.rcp.tpd b/fr.centralesupelec.edf.riseclipse.rcp.target/fr.centralesupelec.edf.riseclipse.rcp.tpd
@@ -28,4 +28,3 @@ location "http://download.eclipse.org/releases/2024-12" eclipse-2024-12 {
 location "https://download.eclipse.org/justj/jres/21/updates/release" justj {
 	org.eclipse.justj.openjdk.hotspot.jre.full.feature.group lazy
 }
-
diff --git a/fr.centralesupelec.edf.riseclipse.rcp.target/pom.xml b/fr.centralesupelec.edf.riseclipse.rcp.target/pom.xml
@@ -29,14 +29,14 @@
  
   <groupId>io.github.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.rcp.target</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1</version>
   <packaging>eclipse-target-definition</packaging>
   <name>[target] RiseClipse RCP Target Definition</name>
   
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>riseclipse-distribution</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
 </project>
diff --git a/fr.centralesupelec.edf.riseclipse.rcp/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.rcp/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: fr.centralesupelec.edf.riseclipse.rcp
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.rcp;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1
 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.rcp
diff --git a/fr.centralesupelec.edf.riseclipse.rcp/pom.xml b/fr.centralesupelec.edf.riseclipse.rcp/pom.xml
@@ -29,14 +29,14 @@
  
   <groupId>io.github.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.rcp</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1</version>
   <packaging>eclipse-plugin</packaging>
   <name>[plugin] RiseClipse RCP</name>
   
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>riseclipse-distribution</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
 </project>
diff --git a/fr.centralesupelec.edf.riseclipse.update-site/.jbang/jbang/version.txt b/fr.centralesupelec.edf.riseclipse.update-site/.jbang/jbang/version.txt
@@ -0,0 +1 @@
+0.126.3
diff --git a/fr.centralesupelec.edf.riseclipse.update-site/pom.xml b/fr.centralesupelec.edf.riseclipse.update-site/pom.xml
@@ -29,14 +29,14 @@
  
   <groupId>io.github.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.update-site</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1</version>
   <packaging>eclipse-repository</packaging>
   <name>[eclipse] RiseClipse Update Site</name>
   
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>riseclipse-distribution</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <profiles>
@@ -90,26 +90,26 @@
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.editor.feature</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.feature</artifactId>
-      <version>1.2.16-SNAPSHOT</version>
+      <version>1.2.15</version>
     </dependency>
     
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.nsd.feature</artifactId>
-      <version>1.2.13-SNAPSHOT</version>
+      <version>1.2.12</version>
     </dependency>
     
-    <!--dependency>
+    <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.cim.cgmes-3.feature</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
-    </dependency-->
+      <version>1.0.2</version>
+    </dependency>
     
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
diff --git a/pom_rcp.xml b/pom_rcp.xml
diff --git a/pom_update_site.xml b/pom_update_site.xml
