Merge pull request #74 from UoY-RoboStar/anthony

Update of xtext and java versions

README.md

@@ -3,18 +3,18 @@ This repository contains the plugins for the RoboChart textual editor
 
 ### Development platform requirements ###
 
-* Eclipse 2019-06
-* Sirius 6.2.0 http://download.eclipse.org/sirius/updates/releases/6.2.0/2018-12
-* Xtext 2.18.0 can be found in the standard repository in http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/ but the option "Show only the latest versions of available software" needs to be unchecked.
+* Eclipse 2021-12
+* Sirius SE 6.5.1 and Xtext SDK 2.25.0 (can be found in the repository in http://download.eclipse.org/releases/2021-12 under Modeling).
 * Maven
 * Git
 
 ### Build (maven) ###
 
         1. mvn clean install
 
-### Build (eclipse) ###
-
+### Build (eclipse)  ###
+        Note: not tested! (for now use maven build only)
+        
         1. Right click circus.robocalc.robochart.textual/src/circus.robocalc.robochart.textual/GenerateRoboChart.mwe2
             1. select 'Run As' > 'MWE2 Workflow'
 

circus.robocalc.robochart.textual.feature/feature.xml

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Version Update 3.1.0 : Nov 2022
+Changes:
+1. Updated description url for robostar (was https://www.cs.york.ac.uk/robostar/robotool/)
+-->
+
+
 <feature
       id="circus.robocalc.robochart.textual.feature"
       label="RoboChart Textual Editor"
-      version="3.0.0.qualifier"
+      version="3.1.0.qualifier"
       provider-name="RoboCalc Project">
 
-   <description url="https://www.cs.york.ac.uk/robostar/robotool/">
+	<description url="https://robostar.cs.york.ac.uk/robotool/">
       This feature includes plugins that provide a textual editor for RoboChart.
    </description>
 

circus.robocalc.robochart.textual.feature/pom.xml

@@ -5,14 +5,16 @@ under the terms of the Eclipse Public License 2.0 which is available at
 http://www.eclipse.org/legal/epl-2.0.
 
 SPDX-License-Identifier: EPL-2.0
+
+Version Update 3.1.0 : Nov 2022
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>circus.robocalc.robochart.textual</groupId>
 		<artifactId>circus.robocalc.robochart.textual.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>circus.robocalc.robochart.textual.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

circus.robocalc.robochart.textual.ide/META-INF/MANIFEST.MF

@@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
 Bundle-SymbolicName: circus.robocalc.robochart.textual.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: circus.robocalc.robochart.textual,
  circus.robocalc.robochart,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: circus.robocalc.robochart.textual.ide.contentassist.antlr.internal,
  circus.robocalc.robochart.textual.ide.contentassist.antlr

circus.robocalc.robochart.textual.ide/pom.xml

@@ -5,14 +5,20 @@ under the terms of the Eclipse Public License 2.0 which is available at
 http://www.eclipse.org/legal/epl-2.0.
 
 SPDX-License-Identifier: EPL-2.0
+
+Version Update 3.1.0 : Nov 2022
+Changes:
+1. dependency log4j-core upgraded (from 2.17.1)
+2. dependency org.eclipse.lsp4j upgraded (from 0.7.0)
+3. dependencies org.ow2.asm - asm, asm-commons, asm-tree upgraded (from 7.0)
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>circus.robocalc.robochart.textual</groupId>
 		<artifactId>circus.robocalc.robochart.textual.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>circus.robocalc.robochart.textual.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>
@@ -21,27 +27,27 @@ SPDX-License-Identifier: EPL-2.0
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.17.1</version>
+			<version>2.19.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lsp4j</groupId>
-			<artifactId>org.eclipse.lsp4j</artifactId>
-			<version>0.7.0</version>
+			<artifactId>org.eclipse.lsp4j</artifactId>	
+			<version>0.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>7.0</version>
+			<version>9.1</version>			
 		</dependency>
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm-commons</artifactId>
-			<version>7.0</version>
+			<version>9.1</version>	
 		</dependency>
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm-tree</artifactId>
-			<version>7.0</version>
+			<version>9.1</version>	
 		</dependency>
 	</dependencies>
 	<build>

circus.robocalc.robochart.textual.repository/pom.xml

@@ -5,14 +5,16 @@ under the terms of the Eclipse Public License 2.0 which is available at
 http://www.eclipse.org/legal/epl-2.0.
 
 SPDX-License-Identifier: EPL-2.0
+
+Version Update 3.1.0 : Nov 2022
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>circus.robocalc.robochart.textual</groupId>
 		<artifactId>circus.robocalc.robochart.textual.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>circus.robocalc.robochart.textual.repository</artifactId>
 	<packaging>eclipse-repository</packaging>

circus.robocalc.robochart.textual.target/circus.robocalc.robochart.textual.target.target

@@ -1,43 +1,53 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="circus.robocalc.robochart.textual.target" sequenceNumber="1">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target includeMode="feature" name="circus.robocalc.robochart.textual.target" sequenceNumber="1">
+
+<!--
+Version Update 3.1.0 : Nov 2022
+Changes:
+1. Added new location org.eclipse.equinox.sdk.feature.group
+2. Use newer repository http://download.eclipse.org/releases/2021-12
+3. Updated MWE2 repository to http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1
+4. Use newer XTEXT version 2.25.0
+5. Updated robostar repo url
+-->
+
 <locations>
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xpand" version="0.0.0"/>
-<unit id="org.eclipse.xtend" version="0.0.0"/>
-<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-03"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.18.1000.v20211124-1800"/>
+<unit id="org.eclipse.pde.feature.group" version="3.14.1000.v20211124-1800"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.28.0.v20211110-0654"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.200.v20211117-0650"/>
+<repository location="http://download.eclipse.org/releases/2021-12"/>
 </location>
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
+<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="2.12.1.v20210218-2134"/>
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
 </location>
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0/"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
 </location>
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-	<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-	<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
-	<unit id="org.junit" version="4.12.0.v201504281640"/>
-	<unit id="org.junit.jupiter.api" version="5.4.0.v20190212-2109"/>
+	<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+	<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
 	<unit id="org.junit.jupiter.engine" version="5.4.0.v20190212-2109"/>
-	<unit id="org.junit.platform.commons" version="1.4.0.v20190212-2109"/>
 	<unit id="org.junit.platform.engine" version="1.4.0.v20190212-2109"/>
 	<unit id="org.junit.platform.launcher" version="1.4.0.v20190212-2109"/>
-	<unit id="org.junit.platform.runner" version="1.4.0.v20190212-2109"/>
 	<unit id="org.opentest4j" version="1.1.1.v20190212-2109"/>
-	<unit id="org.objectweb.asm" version="7.0.0.v20181030-2244"/>
-	<unit id="org.objectweb.asm.tree" version="7.0.0.v20181030-2244"/>
 	<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/orbit/2019-03"/>
 </location>
+
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<unit id="circus.robocalc.robochart.feature.feature.group" version="0.0.0"/>
-		<unit id="circus.robocalc.robochart.feature.source.feature.group" version="0.0.0"/>
-		<repository location="https://www.cs.york.ac.uk/robostar/robotool/metamodel/update"/>
+		<unit id="circus.robocalc.robochart.feature.feature.group" version="2.0.0.202206211010"/>
+		<unit id="circus.robocalc.robochart.feature.source.feature.group" version="2.0.0.202206211010"/>
+		<repository location="https://robostar.cs.york.ac.uk/robotool/update"/>
 	</location>
+
 </locations>
-</target>
+
+</target>

circus.robocalc.robochart.textual.target/pom.xml

@@ -5,14 +5,16 @@ under the terms of the Eclipse Public License 2.0 which is available at
 http://www.eclipse.org/legal/epl-2.0.
 
 SPDX-License-Identifier: EPL-2.0
+
+Version Update 3.1.0 : Nov 2022
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>circus.robocalc.robochart.textual</groupId>
 		<artifactId>circus.robocalc.robochart.textual.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>circus.robocalc.robochart.textual.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>

circus.robocalc.robochart.textual.tests/META-INF/MANIFEST.MF

@@ -3,14 +3,15 @@ Automatic-Module-Name: circus.robocalc.robochart.textual.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
 Bundle-SymbolicName: circus.robocalc.robochart.textual.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: circus.robocalc.robochart.textual,
  circus.robocalc.robochart,
  org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.xtext.testing,
- org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.xtext.testing;bundle-version="2.25.0",
+ org.eclipse.xtext.xbase.testing;bundle-version="2.25.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.25.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: circus.robocalc.robochart.textual.tests;x-internal=true
+

circus.robocalc.robochart.textual.tests/pom.xml

@@ -5,16 +5,21 @@ under the terms of the Eclipse Public License 2.0 which is available at
 http://www.eclipse.org/legal/epl-2.0.
 
 SPDX-License-Identifier: EPL-2.0
+
+Version Update 3.1.0 : Nov 2022
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<groupId>circus.robocalc.robochart.textual</groupId>
 		<artifactId>circus.robocalc.robochart.textual.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
+
 	<artifactId>circus.robocalc.robochart.textual.tests</artifactId>
+
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
@@ -23,6 +28,7 @@ SPDX-License-Identifier: EPL-2.0
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>
 			</plugin>
+			<?ignore
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
@@ -31,15 +37,16 @@ SPDX-License-Identifier: EPL-2.0
 						<extraRequirements>
 							<!-- workaround for missing javax.annotation in tycho version
 							&lt;= 1.3.0. can be removed with tycho 1.4.0 -->
-							<requirement>
+							<requirement>				
 								<type>eclipse-feature</type>
 								<id>org.eclipse.rcp</id>
-								<versionRange>0.0.0</versionRange>
+								<versionRange>0.0.0</versionRange> 
 							</requirement>
 						</extraRequirements>
 					</dependency-resolution>
 				</configuration>
 			</plugin>
+			?>
 		</plugins>
 	</build>
 

circus.robocalc.robochart.textual.ui.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: circus.robocalc.robochart.textual.ui.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
 Bundle-SymbolicName: circus.robocalc.robochart.textual.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: circus.robocalc.robochart.textual.ui,

circus.robocalc.robochart.textual.ui.tests/pom.xml

@@ -5,14 +5,16 @@ under the terms of the Eclipse Public License 2.0 which is available at
 http://www.eclipse.org/legal/epl-2.0.
 
 SPDX-License-Identifier: EPL-2.0
+
+Version Update 3.1.0 : Nov 2022
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>circus.robocalc.robochart.textual</groupId>
 		<artifactId>circus.robocalc.robochart.textual.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>circus.robocalc.robochart.textual.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

circus.robocalc.robochart.textual.ui/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
 Bundle-SymbolicName: circus.robocalc.robochart.textual.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: circus.robocalc.robochart.textual,
@@ -14,17 +14,17 @@ Require-Bundle: circus.robocalc.robochart.textual,
  org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.25.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
- org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
+ org.eclipse.xtend.lib;bundle-version="2.25.0";resolution:=optional,
  org.eclipse.core.resources,
  org.eclipse.ui.forms,
- org.eclipse.xtext.ui;bundle-version="2.17.1"
+ org.eclipse.xtext.ui;bundle-version="2.25.0"
 Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: circus.robocalc.robochart.textual.ui.internal,
  circus.robocalc.robochart.textual.ui.contentassist,
  circus.robocalc.robochart.textual.ui.quickfix