Skip to content

Commit

Permalink
Merge pull request #66 from riseclipse/develop
Browse files Browse the repository at this point in the history
Update to Eclipse 2023-09
  • Loading branch information
marcadetd authored Nov 8, 2023
2 parents 27fe3a6 + 65df369 commit a246539
Show file tree
Hide file tree
Showing 16 changed files with 481 additions and 131 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Shared-Pre-Release-GH.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: sudo apt-get install -y rename

- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download artifacts
uses: actions/download-artifact@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Shared-Prepare-Next-Dev-Tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ jobs:

steps:
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ github.event.repository.name }}

- name: Checkout riseclipse-developper
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: riseclipse/riseclipse-developer
path: riseclipse-developer
Expand Down Expand Up @@ -152,7 +152,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@v4
uses: peter-evans/create-pull-request@v5
with:
base: master
branch: do_release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Shared-Release-On-DockerHub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

# NB: Needs to contain a Dockerfile at root of repository
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: ${{ github.event.repository.name }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Shared-Release-On-Maven-Central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

steps:
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4

# Adapted from
# https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-Apache-Maven
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
git push --tags
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
base: master
branch: do_release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Shared-Validate-Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: sudo apt-get install -y rename

- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download artifact from other workflow
uses: dawidd6/action-download-artifact@v2
Expand All @@ -65,7 +65,7 @@ jobs:
cd ${{ github.workspace }}/artifacts
rename 's/.jar//' *.jar
- uses: ncipollo/release-action@v1.10.0
- uses: ncipollo/release-action@v1
with:
replacesArtifacts: true
allowUpdates: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Shared-Verify-Components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

steps:
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ github.event.repository.name }}
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Shared-Verify-Tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

steps:
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ github.event.repository.name }}
fetch-depth: 0
Expand All @@ -65,7 +65,7 @@ jobs:
cache: "maven"

- name: Checkout riseclipse-developper
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: riseclipse/riseclipse-developer
path: riseclipse-developer
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
----
Copyright (c) 2023 CentraleSupélec & EDF.

All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-v20.html

This file is part of the RiseClipse tool

**Contributors:**
* Computer Science Department, CentraleSupélec
* EDF R&D

**Contacts:**
* [email protected]
* [email protected]

**Web site:**
* https://riseclipse.github.io/
----

## Scenario

This scenario corresponds to the introduction of new versions of the tools used. It shows how to build the SCL validator on a machine to test it before building and deploying this update on GitHub.



## Needed Tools

- Install a JDK 17 or higher ([here for example](https://adoptium.net/))

- Install [**Maven**](https://maven.apache.org)

- Install latest [**Eclipse IDE for Java Developers**](https://eclipseide.org)

- Install from the corresponding Eclipse update site:
- **Eclipse Plug-in Development Environment**
- **EMF - Eclipse Modeling Framework SDK**
- **OCL Examples and Editors SDK**

- Install the **CBI Target Platform Definition DSL** generator using the `https://download.eclipse.org/cbi/updates/tpd/nightly/latest` update site
- Install the **CBI p2 Aggregator Tools** using the `https://download.eclipse.org/cbi/updates/p2-aggregator/tools/nightly` update site


- clone projects

- Create a branch `develop` for project `riseclipse-developer`

- Import `riseclipse-developper` in the Eclipse workspace
- Edit `riseclipse-developer/fr.centralesupelec.edf.riseclipse.developer.eclipse/fr.centralesupelec.edf.riseclipse.developer.eclipse.tpd` so that it points to the latest Eclipse release and the corresponding Orbit site
- Generate the corresponding target file

- Edit `riseclipse-developer/fr.centralesupelec.edf.riseclipse.developer.p2_to_m2/src/main/resources/riseclipse.aggr`, update the mapped repositories, update the versions


- Edit `fr.centralesupelec.edf.riseclipse.developer.maven/pom.xml`:
- Update `project.repositories.repository` with the URL of the new Eclipse version
- Update `project.properties.*`:
- Update `.riseclipse-target-platform-version` with `project.version` without `-SNAPSHOT`
- Update `.maven-*` with latest versions using [https://maven.apache.org/plugins/index.html](https://maven.apache.org/plugins/index.html)
- Update `.tycho-version` with latest one (see on [https://projects.eclipse.org/projects/technology.tycho](https://projects.eclipse.org/projects/technology.tycho)
- Use the generated target file to update plugin versions


- Use a `~/.m2/toolchains.xml` file to specify which jdk to use for the build (see [https://maven.apache.org/guides/mini/guide-using-toolchains.html](https://maven.apache.org/guides/mini/guide-using-toolchains.html), version should be `17` and vendor `temur`)

- In a Terminal, go to `riseclipse-developper` and run `mvn clean install`
- Go to `riseclipse-developper/fr.centralesupelec.edf.riseclipse.developer.p2_to_m2` and run `mvn clean install`


- Go to `riseclipse-main`:
- create a `develop` branch
- edit `pom.xml` and set the `project.parent.version` to the same as `riseclipse-developper/pom.xml:project.version` (with `-SNAPSHOT`)
- edit `fr.centralesupelec.edf.riseclipse.main/META-INF/MANIFEST.MF` and set `Bundle-Version` to the same as `pom.xml:project.version`, replacing `-SNAPSHOT` with `.qualifier`
- run `mvn clean install`

- Do the same for `riseclipse-validator-ocl`, `riseclipse-metamodel-scl2003`, `riseclipse-metamodel-nsd2016` (warning: there can be several `META-INF/MANIFEST.MF` to change)

- Go to `riseclipse-validator-scl2003`:
- create a `develop` branch
- edit `pom.xml`:
- set the `project.parent.version` to the same as `riseclipse-developper/pom.xml:project.version` (with `-SNAPSHOT`)
- update the versions of **RiseClipse needed plugins** to the current ones (with `-SNAPSHOT`)
- edit `fr.centralesupelec.edf.riseclipse.iec61850.scl.validator*/META-INF/MANIFEST.MF`
- set `Bundle-Version` to the same as `pom.xml:project.version`, replacing `-SNAPSHOT` with `.qualifier`
- change `Require-Bundle` versions of RiseClipse bundles to current ones
- run `mvn clean package`
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<?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="1679495107">
<target name="fr.centralesupelec.edf.riseclipse.developer.eclipse" sequenceNumber="1699024490">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
<unit id="com.google.inject" version="5.0.1.v20221112-0806"/>
<unit id="com.google.guava" version="32.1.2.jre"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
<unit id="org.antlr.runtime" version="4.7.2.v20221112-0806"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.eclipse.core.contenttype" version="3.8.200.v20220817-1539"/>
<unit id="org.eclipse.core.commands" version="3.10.400.v20230220-0932"/>
<unit id="org.eclipse.core.expressions" version="3.8.200.v20220613-1047"/>
<unit id="org.eclipse.core.filesystem" version="1.9.500.v20220817-1539"/>
<unit id="org.eclipse.core.jobs" version="3.13.300.v20230111-0823"/>
<unit id="org.eclipse.core.runtime" version="3.26.100.v20221021-0005"/>
<unit id="org.eclipse.core.resources" version="3.18.200.v20230209-0754"/>
<unit id="org.eclipse.core.variables" version="3.5.100.v20210721-1355"/>
<unit id="org.eclipse.debug.core" version="3.20.100.v20230124-1239"/>
<unit id="org.eclipse.core.contenttype" version="3.9.100.v20230630-1232"/>
<unit id="org.eclipse.core.commands" version="3.11.100.v20230708-0916"/>
<unit id="org.eclipse.core.expressions" version="3.9.100.v20230726-0617"/>
<unit id="org.eclipse.core.filesystem" version="1.10.100.v20230717-1727"/>
<unit id="org.eclipse.core.jobs" version="3.15.0.v20230808-1403"/>
<unit id="org.eclipse.core.runtime" version="3.29.0.v20230726-0617"/>
<unit id="org.eclipse.core.resources" version="3.19.100.v20230814-1312"/>
<unit id="org.eclipse.core.variables" version="3.6.100.v20230726-0617"/>
<unit id="org.eclipse.debug.core" version="3.21.100.v20230731-1425"/>
<unit id="org.eclipse.emf.codegen" version="2.23.0.v20230211-1150"/>
<unit id="org.eclipse.emf.codegen.ecore" version="2.33.0.v20230211-1150"/>
<unit id="org.eclipse.emf.common" version="2.28.0.v20230223-0922"/>
<unit id="org.eclipse.emf.ecore" version="2.33.0.v20230226-0921"/>
<unit id="org.eclipse.emf.ecore.xmi" version="2.18.0.v20230211-1150"/>
<unit id="org.eclipse.emf.edit" version="2.18.0.v20230211-1150"/>
<unit id="org.eclipse.emf.codegen.ecore" version="2.35.0.v20230801-1141"/>
<unit id="org.eclipse.emf.common" version="2.29.0.v20230810-0713"/>
<unit id="org.eclipse.emf.ecore" version="2.35.0.v20230829-0934"/>
<unit id="org.eclipse.emf.ecore.xmi" version="2.35.0.v20230801-1141"/>
<unit id="org.eclipse.emf.edit" version="2.19.0.v20230828-0616"/>
<unit id="org.eclipse.emf.mapping.ecore2xml" version="2.12.0.v20230211-1150"/>
<unit id="org.eclipse.equinox.app" version="1.6.200.v20220720-2012"/>
<unit id="org.eclipse.equinox.common" version="3.17.100.v20230202-1341"/>
<unit id="org.eclipse.equinox.preferences" version="3.10.200.v20230120-0604"/>
<unit id="org.eclipse.equinox.registry" version="3.11.200.v20220817-1601"/>
<unit id="org.eclipse.equinox.app" version="1.6.300.v20230630-1303"/>
<unit id="org.eclipse.equinox.common" version="3.18.100.v20230730-1117"/>
<unit id="org.eclipse.equinox.preferences" version="3.10.300.v20230630-1303"/>
<unit id="org.eclipse.equinox.registry" version="3.11.300.v20230801-1826"/>
<unit id="org.eclipse.jdt.annotation" version="2.2.700.v20220826-1026"/>
<unit id="org.eclipse.jdt.core" version="3.33.0.v20230222-1748"/>
<unit id="org.eclipse.jdt.debug" version="3.20.100.v20230119-1127"/>
<unit id="org.eclipse.jdt.launching" version="3.19.900.v20230209-1222"/>
<unit id="org.eclipse.jface" version="3.29.0.v20230214-1401"/>
<unit id="org.eclipse.jdt.core" version="3.35.0.v20230814-1356"/>
<unit id="org.eclipse.jdt.debug" version="3.21.100.v20230728-0612"/>
<unit id="org.eclipse.jdt.launching" version="3.20.100.v20230814-1810"/>
<unit id="org.eclipse.jface" version="3.31.0.v20230821-1552"/>
<unit id="org.eclipse.ocl.common" version="1.18.0.v20221201-0557"/>
<unit id="org.eclipse.ocl.examples.xtext.serializer" version="1.18.0.v20221201-0557"/>
<unit id="org.eclipse.ocl.pivot" version="1.18.0.v20221201-0557"/>
Expand All @@ -44,28 +44,28 @@
<unit id="org.eclipse.ocl.xtext.essentialocl" version="1.18.0.v20221201-0557"/>
<unit id="org.eclipse.ocl.xtext.oclinecore" version="1.18.0.v20221201-0557"/>
<unit id="org.eclipse.ocl.xtext.oclstdlib" version="1.18.0.v20221201-0557"/>
<unit id="org.eclipse.osgi" version="3.18.300.v20230220-1352"/>
<unit id="org.eclipse.osgi" version="3.18.500.v20230801-1826"/>
<unit id="org.eclipse.osgi.compatibility.state" version="1.2.800.v20221116-1440"/>
<unit id="org.eclipse.swt" version="3.123.0.v20230220-1431"/>
<unit id="org.eclipse.text" version="3.12.300.v20220921-1010"/>
<unit id="org.eclipse.swt" version="3.124.100.v20230825-1346"/>
<unit id="org.eclipse.text" version="3.13.100.v20230801-1334"/>
<unit id="org.eclipse.uml2.codegen.ecore" version="2.5.2.v20221116-1811"/>
<unit id="org.eclipse.uml2.common" version="2.5.0.v20221116-1811"/>
<unit id="org.eclipse.uml2.uml" version="5.5.0.v20221116-1811"/>
<unit id="org.eclipse.uml2.uml.profile.standard" version="1.5.0.v20221116-1811"/>
<unit id="org.eclipse.uml2.uml.resources" version="5.5.0.v20221116-1811"/>
<unit id="org.eclipse.uml2.types" version="2.5.0.v20221116-1811"/>
<unit id="org.eclipse.xtend.lib" version="2.30.0.v20230227-1111"/>
<unit id="org.eclipse.xtend.lib.macro" version="2.30.0.v20230227-1111"/>
<unit id="org.eclipse.xtext" version="2.30.0.v20230227-1116"/>
<unit id="org.eclipse.xtext.xbase.lib" version="2.30.0.v20230227-1111"/>
<unit id="org.eclipse.xtext.util" version="2.30.0.v20230227-1116"/>
<repository location="http://download.eclipse.org/releases/2023-03"/>
<unit id="org.eclipse.xtend.lib" version="2.32.0.v20230827-1315"/>
<unit id="org.eclipse.xtend.lib.macro" version="2.32.0.v20230827-1315"/>
<unit id="org.eclipse.xtext" version="2.32.0.v20230827-1315"/>
<unit id="org.eclipse.xtext.xbase.lib" version="2.32.0.v20230827-1315"/>
<unit id="org.eclipse.xtext.util" version="2.32.0.v20230827-1315"/>
<repository location="http://download.eclipse.org/releases/2023-09"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.cli" version="1.4.0.v20221112-0806"/>
<unit id="org.apache.commons.cli" version="1.5.0"/>
<unit id="org.apache.commons.lang3" version="3.12.0.v20221221-1931"/>
<repository id="orbit-2023-03" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/>
<repository id="orbit-2023-09" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
</target>
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@

target "fr.centralesupelec.edf.riseclipse.developer.eclipse"

environment JavaSE-11
environment JavaSE-17

location "http://download.eclipse.org/releases/2023-03" {
// package com.google.common.util.concurrent.internal is missing in com.google.guava version 31.1.0
com.google.guava [30.1.0,31.0.0)
location "http://download.eclipse.org/releases/2023-09" {
com.google.guava
com.google.inject
javax.inject
org.antlr.runtime [3.2.0,3.2.1)
org.antlr.runtime
org.aopalliance
org.apache.log4j
org.eclipse.core.contenttype
Expand Down Expand Up @@ -62,7 +61,7 @@ location "http://download.eclipse.org/releases/2023-03" {
org.eclipse.xtext.util
}

location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository" orbit-2023-03 {
location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0" orbit-2023-09 {
org.apache.commons.cli
org.apache.commons.lang3
}
Expand Down
Loading

0 comments on commit a246539

Please sign in to comment.