Use OCL from RiseClipse to get extended stdlib

.github/workflows/Release-Snapshot-On-OSSRH.yml → .github/workflows/Release-Snapshot-On-Maven-Central.yml

@@ -20,6 +20,7 @@
 name: Release snapshots on Central
 
 on:
+  workflow_dispatch: # Allow manual trigger for expired snapshot
   push:
     branches:
       - 'develop'

.github/workflows/Shared-Deploy-Snapshot-Components.yml

@@ -45,19 +45,19 @@ jobs:
 
     steps:
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: ${{ github.event.repository.name }}
         fetch-depth: 0
 
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '21'
 
     - name: Setup Maven
-      uses: s4u/maven-settings-action@v3.1.0
+      uses: s4u/maven-settings-action@v4.0.0
       with:
         sonatypeSnapshots: false
         githubServer: false
@@ -69,7 +69,7 @@ jobs:
           }]
 
     - name: Checkout riseclipse-developper
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: riseclipse/riseclipse-developer
         path: riseclipse-developer

.github/workflows/Shared-Deploy-Snapshot-Tools.yml

@@ -54,20 +54,20 @@ jobs:
 
     steps:
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: ${{ github.event.repository.name }}
         ref: develop
         fetch-depth: 0
 
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: "temurin"
         java-version: "21"
 
     - name: Checkout riseclipse-developper
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: riseclipse/riseclipse-developer
         path: riseclipse-developer
@@ -119,7 +119,7 @@ jobs:
       id: release_artifacts
 
     - name: Send email about this new development version
-      uses: dawidd6/action-send-mail@v5
+      uses: dawidd6/action-send-mail@v15
       with:
         server_address: smtp.gmail.com
         # Server port, default 25:
@@ -137,5 +137,10 @@ jobs:
         # Required sender full name (address can be skipped):
         from: riseclipse@gmail.com
         # Optional plain body:
-        body: The new development version is available at ${{ steps.release_artifacts.outputs.html_url }}
+        body: |
+            Hi,
+            A new development version is available at ${{ steps.release_artifacts.outputs.html_url }}.
+            See changes at "${{ github.event.repository.name }}/blob/develop/CHANGELOG.md"
+            ----
+            The RiseClipse Team (https://riseclipse.github.io/)
 

.github/workflows/Shared-Pre-Release-GH.yml

@@ -40,10 +40,10 @@ jobs:
       run: sudo apt-get install -y rename
 
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         path: ${{ github.workspace }}/artifacts
 

.github/workflows/Shared-Prepare-Next-Dev-Tools.yml

@@ -51,19 +51,19 @@ jobs:
 
     steps:
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: ${{ github.event.repository.name }}
 
     - name: Checkout riseclipse-developper
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: riseclipse/riseclipse-developer
         path: riseclipse-developer
         ref: master
 
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '21'
@@ -124,14 +124,14 @@ jobs:
       id: artifact_name
 
     - name: Upload artifact 1
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ steps.artifact_name.outputs.artifact_1_filename }}-${{ steps.get_version.outputs.project_version }}.jar
         path: ${{ github.workspace }}/${{ steps.artifact_name.outputs.artifact_1_no_ext }}-${{ steps.get_version.outputs.project_version }}.jar
 
     - name: Upload artifact 2 if exists
       if: "${{ inputs.jarPath2 != '' }}"
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ steps.artifact_name.outputs.artifact_2_filename }}-${{ steps.get_version.outputs.project_version }}.jar
         path: ${{ github.workspace }}/${{ steps.artifact_name.outputs.artifact_2_no_ext }}-${{ steps.get_version.outputs.project_version }}.jar
@@ -155,7 +155,7 @@ jobs:
         git commit -m "[actions] prepare next development version ${{ github.event.repository.name }}-${{ steps.next_version.outputs.project_version }}"
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7
+      uses: peter-evans/create-pull-request@v8
       with:
         base: master
         branch: do_release

.github/workflows/Shared-Release-On-DockerHub.yml

@@ -54,16 +54,16 @@ jobs:
       run: sudo apt-get install rename
 
     - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v4
 
     # NB: Needs to contain a Dockerfile at root of repository
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: ${{ github.event.repository.name }}
 
     - name: Download artifacts
-      uses: dawidd6/action-download-artifact@v9
+      uses: dawidd6/action-download-artifact@v18
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: Pre-Release-and-Prepare-Next-Dev.yml
@@ -76,21 +76,21 @@ jobs:
         rename 's/.jar//' *.jar
 
     - name: Log in to Docker Hub
-      uses: docker/login-action@v3
+      uses: docker/login-action@v4
       with:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build and push Docker image with given tag
-      uses: docker/build-push-action@v6
+      uses: docker/build-push-action@v7
       with:
         context: ${{ github.workspace }}/${{ github.event.repository.name }}
         push: true
         tags: riseclipse/${{ inputs.DOCKER_REPOSITORY }}:${{ inputs.release_version }}
 
     - name: Build and push Docker image with latest tag
       if: inputs.release_latest
-      uses: docker/build-push-action@v6
+      uses: docker/build-push-action@v7
       with:
         context: ${{ github.workspace }}/${{ github.event.repository.name }}
         push: true

.github/workflows/Shared-Release-On-Maven-Central.yml

@@ -42,12 +42,12 @@ jobs:
 
     steps:
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     # Adapted from
     # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-Apache-Maven
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '21'
@@ -88,7 +88,7 @@ jobs:
         git push --tags
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7
+      uses: peter-evans/create-pull-request@v8
       with:
         base: master
         branch: do_release

.github/workflows/Shared-Release-On-RiseClipseWeb.yml

@@ -50,12 +50,12 @@ jobs:
       run: sudo apt-get install rename
 
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: ${{ github.event.repository.name }}
 
     - name: Download artifacts
-      uses: dawidd6/action-download-artifact@v9
+      uses: dawidd6/action-download-artifact@v18
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: Pre-Release-and-Prepare-Next-Dev.yml

.github/workflows/Shared-Validate-Release.yml

@@ -42,10 +42,10 @@ jobs:
       run: sudo apt-get install -y rename
 
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Download artifact from other workflow
-      uses: dawidd6/action-download-artifact@v9
+      uses: dawidd6/action-download-artifact@v18
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: Pre-Release-and-Prepare-Next-Dev.yml
@@ -67,6 +67,8 @@ jobs:
         rename 's/.jar//' *.jar
 
     - name: Release artifacts
+      # The github repository of this action is now archived!
+      # TODO: find another
       uses: ncipollo/release-action@v1
       with:
         replacesArtifacts: true

.github/workflows/Shared-Verify-Components.yml

@@ -41,13 +41,13 @@ jobs:
 
     steps:
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: ${{ github.event.repository.name }}
         fetch-depth: 0
 
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '21'

.github/workflows/Shared-Verify-Tools.yml

@@ -53,20 +53,20 @@ jobs:
 
     steps:
     - name: Checkout ${{ github.event.repository.name }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: ${{ github.event.repository.name }}
         fetch-depth: 0
 
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: "temurin"
         java-version: "21"
         cache: "maven"
 
     - name: Checkout riseclipse-developper
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: riseclipse/riseclipse-developer
         path: riseclipse-developer
@@ -118,14 +118,14 @@ jobs:
       id: artifacts_metadata
 
     - name: Upload artifact 1
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ steps.artifacts_metadata.outputs.artifact_1_filename }}
         path: ${{ steps.artifacts_metadata.outputs.artifact_1_path }}
 
     - name: Upload artifact 2 if exists
       if: "${{ inputs.jar_path_2 != '' }}"
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ steps.artifacts_metadata.outputs.artifact_2_filename }}
         path: ${{ steps.artifacts_metadata.outputs.artifact_2_path }}

build_locally.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# Exit on error
+set -e
+
+# Trap SIGINT (Ctrl+C) and exit the script
+trap 'echo -e "\nScript interrupted. Exiting..."; exit 130' SIGINT
+
+GOALS=$*
+
+cd ../riseclipse-developer
+mvn $GOALS
+cd ../riseclipse-developer/fr.centralesupelec.edf.riseclipse.developer.p2_to_m2
+mvn $GOALS
+cd ..
+cd ../riseclipse-main
+mvn $GOALS
+cd ../riseclipse-editor
+mvn $GOALS
+cd ../riseclipse-validator-ocl
+mvn $GOALS
+cd ../riseclipse-metamodel-scl2003
+mvn $GOALS
+cd ../riseclipse-metamodel-nsd2016
+mvn $GOALS
+cd ../riseclipse-metamodel-cim
+mvn $GOALS
+cd ../riseclipse-metamodel-cgmes-3-0-0
+mvn $GOALS
+cd ../riseclipse-validator-scl2003
+mvn $GOALS
+cd ../riseclipse-validator-cgmes-3-0-0
+mvn $GOALS
+cd ../riseclipse-distribution
+mvn $GOALS
+mvn -Pupdate-site $GOALS
+mvn -Prcp $GOALS

fr.centralesupelec.edf.riseclipse.developer.eclipse/fr.centralesupelec.edf.riseclipse.developer.eclipse.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="fr.centralesupelec.edf.riseclipse.developer.eclipse" sequenceNumber="1737635701">
+<target name="fr.centralesupelec.edf.riseclipse.developer.eclipse" sequenceNumber="1773329593">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="33.3.1.jre"/>
@@ -35,14 +35,6 @@
       <unit id="org.eclipse.jdt.debug" version="3.21.600.v20241021-1521"/>
       <unit id="org.eclipse.jdt.launching" version="3.23.100.v20241028-0746"/>
       <unit id="org.eclipse.jface" version="3.35.100.v20241003-1431"/>
-      <unit id="org.eclipse.ocl.common" version="1.22.0.v20240902-1518"/>
-      <unit id="org.eclipse.ocl.pivot" version="1.22.0.v20240902-1518"/>
-      <unit id="org.eclipse.ocl.pivot.uml" version="1.22.0.v20240902-1518"/>
-      <unit id="org.eclipse.ocl.xtext.base" version="1.22.0.v20240902-1518"/>
-      <unit id="org.eclipse.ocl.xtext.completeocl" version="1.22.0.v20240902-1518"/>
-      <unit id="org.eclipse.ocl.xtext.essentialocl" version="1.22.0.v20240902-1518"/>
-      <unit id="org.eclipse.ocl.xtext.oclinecore" version="1.22.0.v20240902-1518"/>
-      <unit id="org.eclipse.ocl.xtext.oclstdlib" version="1.22.0.v20240902-1518"/>
       <unit id="org.eclipse.osgi" version="3.22.0.v20241030-2121"/>
       <unit id="org.eclipse.osgi.compatibility.state" version="1.2.1000.v20240213-1057"/>
       <unit id="org.eclipse.swt" version="3.128.0.v20241113-2009"/>
@@ -60,6 +52,18 @@
       <unit id="org.eclipse.xtext.util" version="2.37.0.v20241119-0857"/>
       <repository id="eclipse-2024-12" location="http://download.eclipse.org/releases/2024-12"/>
     </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.common" version="1.23.0.v20260312-1306"/>
+      <unit id="org.eclipse.ocl.tools.feature.group" version="3.23.1.v20260312-1306"/>
+      <unit id="org.eclipse.ocl.pivot" version="1.23.0.v20260312-1306"/>
+      <unit id="org.eclipse.ocl.pivot.uml" version="1.23.0.v20260312-1306"/>
+      <unit id="org.eclipse.ocl.xtext.base" version="1.23.0.v20260312-1306"/>
+      <unit id="org.eclipse.ocl.xtext.completeocl" version="1.23.0.v20260312-1306"/>
+      <unit id="org.eclipse.ocl.xtext.essentialocl" version="1.23.0.v20260312-1306"/>
+      <unit id="org.eclipse.ocl.xtext.oclinecore" version="1.23.0.v20260312-1306"/>
+      <unit id="org.eclipse.ocl.xtext.oclstdlib" version="1.23.0.v20260312-1306"/>
+      <repository id="ocl-with-extended-stdlib" location="https://github.com/riseclipse/org.eclipse.ocl/releases/download/nightly/"/>
+    </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.commons.cli" version="1.9.0"/>
       <unit id="org.apache.commons.lang3" version="3.17.0"/>