Merge pull request #11 from tshoang/latest

Rodin Bundle 2022-12 (without UML-B)
eventB-Soton · Apr 3, 2023 · 20b7320 · 20b7320
2 parents c551c00 + 9c79f21
commit 20b7320
Show file tree

Hide file tree

Showing 17 changed files with 119 additions and 69 deletions.
diff --git a/.github/workflows/MavenCI.yml b/.github/workflows/MavenCI.yml
@@ -0,0 +1,49 @@
+# This is a workflow for building with Maven. This is adapted from
+# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+name: Maven CI
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the "latest" or "stable" branches
+  push:
+    branches: [ "latest", "stable" ]
+  pull_request:
+    branches: [ "latest", "stable" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Currently, there is only a single job called "build"
+jobs:
+  # "build" job
+  build:
+    # Run on the latest Ubuntu runner
+    runs-on: ubuntu-latest
+
+    # Currently, the "build" job contains the following steps
+    # 1. Check out the repository
+    # 2. (Restore from) Cache the local Maven repository
+    # 3. Set up JDK 11
+    # 4. Run the Maven build with "mvn clean verify"
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+
+      - name: Cache local Maven repository
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+
+      # Runs the maven build
+      - name: Build with Maven
+        run: mvn clean verify
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Rodin-Bundles
 =============
 
-[![Build Status](https://app.travis-ci.com/eventB-Soton/Rodin-Bundles.svg?branch=master)](https://app.travis-ci.com/github/eventB-Soton/Rodin-Bundles)
+[![Latest Status](https://github.com/eventB-Soton/Rodin-Bundles/actions/workflows/MavenCI.yml/badge.svg?branch=latest)](https://github.com/eventB-Soton/Rodin-Bundles/actions/workflows/MavenCI.yml/badge.svg)
 
 Rodin Platform Bundles that includes features developed by our
 group. Information about the Rodin Platform Bundles are in the [Wiki](https://github.com/eventB-Soton/Rodin-Bundles/wiki).
diff --git a/ac.soton.rodinp.baseline/.settings/org.eclipse.core.resources.prefs b/ac.soton.rodinp.baseline/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ac.soton.rodinp.baseline/Rodin.p2.inf b/ac.soton.rodinp.baseline/Rodin.p2.inf
@@ -1,7 +1,7 @@
 instructions.configure=\
   mkdir(path:${installFolder}/dropins);\
-  addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.18,name:Eclipse 2020-12);\
-  addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.18,name:Eclipse 2020-12);\
+  addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:Eclipse 2021-06);\
+  addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:Eclipse 2022-06);\
   addRepository(type:0,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
   addRepository(type:1,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
   addRepository(type:0,location:http${#58}//rodin-b-sharp.sourceforge.net/updates,name:Rodin Plug-ins);\

diff --git a/ac.soton.rodinp.baseline/Rodin.product b/ac.soton.rodinp.baseline/Rodin.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.7.0.202204290954-46a4e4e99-BL2206" useFeatures="true" includeLaunchers="true">
+<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.7.0.202204290954-46a4e4e99-BL2212" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="icons/about.gif"/>
@@ -50,22 +50,18 @@
    <features>
       <feature id="org.rodinp.platform" version="3.7.0.qualifier"/>
       <feature id="org.rodinp.handbook.feature" installMode="root"/>
-      <feature id="ac.soton.xeventb.sdk" version="2.1.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.statemachines.sdk" version="4.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.statemachines.animation.sdk" version="3.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.classdiagrams.sdk" version="3.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.scenariochecker.sdk" version="1.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.roseEditor.sdk" version="1.7.0.qualifier" installMode="root"/>
-      <feature id="ch.ethz.eventb.utils.sdk" version="0.2.6.qualifier" installMode="root"/>
-      <feature id="org.eventb.emf.sdk" version="6.1.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.emf.translator.sdk" version="3.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.core.extension.sdk" version="6.1.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.emf.translator.eventb.sdk" version="0.1.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.probsupport.sdk" version="0.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.diagrams.sdk" version="8.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.inclusion.sdk" version="2.0.2.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.record.sdk" version="0.1.2.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.containment.sdk" version="0.0.2.qualifier" installMode="root"/>
+      <feature id="ac.soton.xeventb.sdk" version="3.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.roseEditor.sdk" version="1.8.0.qualifier" installMode="root"/>
+      <feature id="ch.ethz.eventb.utils.sdk" version="0.3.0.qualifier" installMode="root"/>
+      <feature id="org.eventb.emf.sdk" version="7.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.emf.translator.sdk" version="4.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.core.extension.sdk" version="7.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.emf.translator.eventb.sdk" version="0.2.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.probsupport.sdk" version="0.1.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.diagrams.sdk" version="9.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.inclusion.sdk" version="3.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.record.sdk" version="1.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.containment.sdk" version="1.0.0.qualifier" installMode="root"/>
    </features>
 
    <configurations>

diff --git a/ac.soton.rodinp.baseline/pom.xml b/ac.soton.rodinp.baseline/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020, 2021 University of Southampton.
+    Copyright (c) 2020, 2023 University of Southampton.
    
     This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
@@ -39,7 +39,7 @@
   </repositories>
 
   <properties>
-    <bundle-suffix>BL2206</bundle-suffix>
+    <bundle-suffix>BL2212</bundle-suffix>
   </properties>
 
   <packaging>eclipse-repository</packaging>

diff --git a/ac.soton.rodinp.releases/.settings/org.eclipse.core.resources.prefs b/ac.soton.rodinp.releases/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ac.soton.rodinp.releases/Rodin.p2.inf b/ac.soton.rodinp.releases/Rodin.p2.inf
@@ -1,9 +1,9 @@
 instructions.configure=\
   mkdir(path:${installFolder}/dropins);\
-  addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
-  addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
-  addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.18,name:The Eclipse Project 4.18 Updates);\
-  addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.18,name:The Eclipse Project 4.18 Updates);\
+  addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2022-06,name:2022-06);\
+  addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2022-06,name:2022-06);\
+  addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project 4.22 Updates);\
+  addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project 4.22 Updates);\
   addRepository(type:0,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
   addRepository(type:1,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
   addRepository(type:0,location:http${#58}//rodin-b-sharp.sourceforge.net/updates,name:Rodin Plug-ins);\

diff --git a/ac.soton.rodinp.releases/Rodin.product b/ac.soton.rodinp.releases/Rodin.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.7.0.202204290954-46a4e4e99-RL2206" useFeatures="true" includeLaunchers="true">
+<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.7.0.202204290954-46a4e4e99-RL2212" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="icons/about.gif"/>
@@ -50,12 +50,8 @@
    <features>
       <feature id="org.rodinp.platform" version="3.7.0.qualifier"/>
       <feature id="org.rodinp.handbook.feature" installMode="root"/>
-      <feature id="ac.soton.xeventb.feature" version="2.1.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.statemachines.feature" version="4.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.statemachines.animation.feature" version="3.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.classdiagrams.feature" version="3.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.scenariochecker.feature" version="1.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.roseEditor.feature" version="1.7.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.xeventb.feature" version="3.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.roseEditor.feature" version="1.8.0.qualifier" installMode="root"/>
       <feature id="org.eventb.smt" version="1.5.0.qualifier" installMode="root"/>
       <feature id="de.prob2.feature" version="3.0.10.qualifier" installMode="root"/>
       <feature id="org.eclipse.rmf.reqif10.pror.feature" version="0.13.0.qualifier" installMode="root"/>

diff --git a/ac.soton.rodinp.releases/pom.xml b/ac.soton.rodinp.releases/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020, 2021 University of Southampton.
+    Copyright (c) 2020, 2023 University of Southampton.
    
     This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
@@ -30,7 +30,7 @@
   <version>3.7.0-SNAPSHOT</version>
 
   <properties>
-    <bundle-suffix>RL2206</bundle-suffix>
+    <bundle-suffix>RL2212</bundle-suffix>
   </properties>
 
   <repositories>
@@ -40,6 +40,11 @@
       <layout>p2</layout>
       <url>http://rodin-b-sharp.sourceforge.net/core-updates</url>
     </repository>
+    <repository>
+      <id>eclipse-updates</id>
+      <layout>p2</layout>
+      <url>https://download.eclipse.org/eclipse/updates/4.20</url>
+    </repository>
     <repository>
       <id>rmf-updates</id>
       <layout>p2</layout>

diff --git a/ac.soton.rodinp.releng/.settings/org.eclipse.core.resources.prefs b/ac.soton.rodinp.releng/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ac.soton.rodinp.releng/pom.xml b/ac.soton.rodinp.releng/pom.xml
@@ -29,8 +29,8 @@
     <rodin-version>3.7.0.202204290954-46a4e4e99</rodin-version>
 
     <!-- Plug-in versions -->
-    <tycho-version>2.0.0</tycho-version>
-    <maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
+    <tycho-version>2.7.5</tycho-version>
+    <maven-resources-plugin-version>3.3.0</maven-resources-plugin-version>
     <rodinp-dev>org.rodinp.dev</rodinp-dev>
     <!-- <maven-antrun-plugin-version>3.0.0</maven-antrun-plugin-version> -->
     <!-- <maven-toolchains-plugin-version>3.0.0</maven-toolchains-plugin-version> -->

diff --git a/ac.soton.rodinp.target/.settings/org.eclipse.core.resources.prefs b/ac.soton.rodinp.target/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ac.soton.rodinp.target/Rodin.p2.inf b/ac.soton.rodinp.target/Rodin.p2.inf
@@ -1,9 +1,9 @@
 instructions.configure=\
   mkdir(path:${installFolder}/dropins);\
-  addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
-  addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
-  addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.18,name:The Eclipse Project 4.18 Updates);\
-  addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.18,name:The Eclipse Project 4.18 Updates);\
+  addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2022-06,name:2022-06);\
+  addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2022-06,name:2022-06);\
+  addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project 4.22 Updates);\
+  addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project 4.22 Updates);\
   addRepository(type:0,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
   addRepository(type:1,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
   addRepository(type:0,location:http${#58}//rodin-b-sharp.sourceforge.net/updates,name:Rodin Plug-ins);\

diff --git a/ac.soton.rodinp.target/Rodin.product b/ac.soton.rodinp.target/Rodin.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.7.0.202204290954-46a4e4e99-TG2206" useFeatures="true" includeLaunchers="true">
+<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.7.0.202204290954-46a4e4e99-TG2212" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="icons/about.gif"/>
@@ -52,30 +52,24 @@
       <feature id="org.rodinp.platform.source" version="3.7.0.qualifier" installMode="root"/>
       <feature id="org.rodinp.platform.tests.source" version="3.7.0.qualifier" installMode="root"/>
       <feature id="org.rodinp.handbook.feature" installMode="root"/>
-
       <feature id="org.eclipse.sdk" version="4.22.0.qualifier" installMode="root"/>
       <feature id="org.eclipse.egit" version="6.0.0.qualifier" installMode="root"/>
       <feature id="org.eclipse.emf.sdk" version="2.28.0.qualifier" installMode="root"/>
       <feature id="org.eclipse.xtext.sdk" version="2.25.0.qualifier" installMode="root"/>
-
-      <feature id="ac.soton.xeventb.sdk" version="2.1.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.statemachines.sdk" version="4.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.statemachines.animation.sdk" version="3.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.classdiagrams.sdk" version="3.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.scenariochecker.sdk" version="1.0.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.roseEditor.sdk" version="1.7.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.xeventb.sdk" version="3.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.roseEditor.sdk" version="1.8.0.qualifier" installMode="root"/>
       <feature id="org.eventb.smt" version="1.5.0.qualifier" installMode="root"/>
       <feature id="de.prob2.feature" version="3.0.10.qualifier" installMode="root"/>
-      <feature id="ch.ethz.eventb.utils.sdk" version="0.2.6.qualifier" installMode="root"/>
-      <feature id="org.eventb.emf.sdk" version="6.1.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.emf.translator.sdk" version="3.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.core.extension.sdk" version="6.1.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.emf.translator.eventb.sdk" version="0.1.0.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.probsupport.sdk" version="0.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.diagrams.sdk" version="8.0.1.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.inclusion.sdk" version="2.0.2.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.record.sdk" version="0.1.2.qualifier" installMode="root"/>
-      <feature id="ac.soton.eventb.emf.containment.sdk" version="0.0.2.qualifier" installMode="root"/>
+      <feature id="ch.ethz.eventb.utils.sdk" version="0.3.0.qualifier" installMode="root"/>
+      <feature id="org.eventb.emf.sdk" version="7.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.emf.translator.sdk" version="4.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.core.extension.sdk" version="7.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.emf.translator.eventb.sdk" version="0.2.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.probsupport.sdk" version="0.1.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.diagrams.sdk" version="9.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.inclusion.sdk" version="3.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.record.sdk" version="1.0.0.qualifier" installMode="root"/>
+      <feature id="ac.soton.eventb.emf.containment.sdk" version="1.0.0.qualifier" installMode="root"/>
       <feature id="org.eclipse.gmf.sdk" version="3.2.1.qualifier" installMode="root"/>
       <feature id="org.eclipse.rmf.reqif10.pror.sdk.feature" version="0.13.0.qualifier" installMode="root"/>
       <feature id="org.eclipse.sphinx.sdk" version="0.11.0.qualifier" installMode="root"/>

diff --git a/ac.soton.rodinp.target/pom.xml b/ac.soton.rodinp.target/pom.xml
@@ -30,7 +30,7 @@
   <version>3.7.0-SNAPSHOT</version>
 
   <properties>
-    <bundle-suffix>TG2206</bundle-suffix>
+    <bundle-suffix>TG2212</bundle-suffix>
   </properties>
 
   <repositories>
@@ -40,6 +40,16 @@
       <layout>p2</layout>
       <url>file://${basedir}/../${rodinp-dev}</url>
     </repository>
+    <repository>
+      <id>eclipse-updates</id>
+      <layout>p2</layout>
+      <url>https://download.eclipse.org/eclipse/updates/4.20</url>
+    </repository>
+    <repository>
+      <id>xpand-updates</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/modeling/m2t/xpand/updates/releases/</url>
+    </repository>
     <repository>
       <id>rmf-updates</id>
       <layout>p2</layout>