update build versions

com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF

@@ -9,8 +9,7 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide,
- org.antlr.runtime
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.rdl.ide.contentassist.antlr.internal,
  com.minres.rdl.ide.contentassist.antlr
-

com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml

@@ -795,13 +795,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.variables"
          download-size="0"
@@ -1256,13 +1249,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.ds"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.xtext.common.types"
          download-size="0"

com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="RDL Editor" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.2.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="RDL Editor" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.3.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml

@@ -77,7 +77,7 @@
 								<artifactItem>
 									<groupId>com.minres.rdl</groupId>
 									<artifactId>com.minres.rdl</artifactId>
-									<version>${rdl-plugin-version}</version>
+									<version>${rdl-plugin.version}</version>
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -175,7 +175,7 @@
 		<dependency>
 			<groupId>com.minres.rdl</groupId>
 			<artifactId>com.minres.rdl</artifactId>
-			<version>${rdl-plugin-version}</version>
+			<version>${rdl-plugin.version}</version>
 			<type>eclipse-plugin</type>
 		</dependency>
 	</dependencies>

com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="com.minres.rdl.target" sequenceNumber="1">
+<?pde version="3.8"?>
+<target name="com.minres.rdl.target" sequenceNumber="1">
 <locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
@@ -7,31 +8,32 @@
 			<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"/>
-			<repository location="https://download.eclipse.org/releases/2020-06"/>
+			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/releases/2021-03"/>
 		</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="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.3/"/>
+			<repository location="https://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="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/"/>
+			<repository location="https://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.8.2.v20180104-1110"/>
+			<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
 			<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.6.0.v20200203-2009"/>
+			<unit id="org.junit.jupiter.api" version="5.7.1.v20210222-1948"/>
-			<unit id="org.junit.jupiter.engine" version="5.6.0.v20200203-2009"/>
+			<unit id="org.junit.jupiter.engine" version="5.7.1.v20210222-1948"/>
-			<unit id="org.junit.platform.commons" version="1.6.0.v20200203-2009"/>
+			<unit id="org.junit.platform.commons" version="1.7.1.v20210222-1948"/>
-			<unit id="org.junit.platform.engine" version="1.6.0.v20200203-2009"/>
+			<unit id="org.junit.platform.engine" version="1.7.1.v20210222-1948"/>
-			<unit id="org.junit.platform.launcher" version="1.6.0.v20200203-2009"/>
+			<unit id="org.junit.platform.launcher" version="1.7.1.v20210222-1948"/>
-			<unit id="org.junit.platform.runner" version="1.6.0.v20200203-2009"/>
+			<unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/>
 			<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
-			<unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
+			<unit id="org.objectweb.asm" version="9.1.0.v20210209-1849"/>
-			<unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
+			<unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/>
 			<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-03"/>
 		</location>
 </locations>
 </target>

com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF

@@ -7,10 +7,9 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-SymbolicName: com.minres.rdl.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,
- org.junit;bundle-version="4.12.0",
+ org.junit.jupiter.api;bundle-version="[5.1.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
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.rdl.tests;x-internal=true
-

com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF

@@ -7,13 +7,12 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-SymbolicName: com.minres.rdl.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl.ui,
- org.junit;bundle-version="4.12.0",
+ org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.core.runtime,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.ui.workbench;resolution:=optional
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.rdl.ui.tests;x-internal=true
-

com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml

@@ -23,25 +23,7 @@
 					<useUIHarness>true</useUIHarness>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<configuration>
-					<dependency-resolution>
-						<extraRequirements>
-							<!-- to get the org.eclipse.osgi.compatibility.state plugin
-							if the target platform is Luna or later.
-							(backward compatible with kepler and previous versions)
-							see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
-							<requirement>
-								<type>eclipse-feature</type>
-								<id>org.eclipse.rcp</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-						</extraRequirements>
-					</dependency-resolution>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
+
 </project>

com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF

@@ -17,14 +17,14 @@ Require-Bundle: com.minres.rdl,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
- org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui.forms,
  org.eclipse.jdt.core,
  org.eclipse.pde.core
 Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.rdl.ui.internal,
  com.minres.rdl.ui.contentassist,
  com.minres.rdl.ui.quickfix,

com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/structural/ui/hyperlink/MyHyperlinkHelper.xtend

@@ -11,6 +11,7 @@ import org.eclipse.xtext.scoping.impl.ImportUriResolver
 import org.eclipse.xtext.ui.editor.hyperlinking.HyperlinkHelper
 import org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkAcceptor
 import org.eclipse.xtext.util.TextRegion
+import org.eclipse.jface.text.IRegion
 
 class MyHyperlinkHelper extends HyperlinkHelper {
 	
@@ -33,7 +34,7 @@ class MyHyperlinkHelper extends HyperlinkHelper {
 						val textRegion = leaf.getTextRegion();
 						val uri = EcoreUtil.getURI(top);
 						val result = hyperlinkProvider.get();
-						result.setHyperlinkRegion(new Region(textRegion.getOffset(), textRegion.getLength()));
+						result.setHyperlinkRegion(new Region(textRegion.getOffset(), textRegion.getLength()) as IRegion);
 						result.setURI(if(uri.isPlatformResource()) uri else resource.getResourceSet().getURIConverter().normalize(uri));
 						result.setHyperlinkText(labelProvider.getText(top));
 						if(result instanceof MyXtextHyperlink) result.selectTarget=false

com.minres.rdl.parent/com.minres.rdl.web/pom.xml

@@ -27,7 +27,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.3</version>
 				<configuration>
 					<warSourceDirectory>WebRoot</warSourceDirectory>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -36,7 +36,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>9.4.9.v20180320</version>
+				<version>9.4.34.v20201102</version>
 				<configuration>
 					<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
 				</configuration>
@@ -44,7 +44,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<id>add-source</id>
@@ -76,7 +76,7 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>com.minres.rdl</artifactId>
-			<version>${rdl-plugin-version}</version>
+			<version>${rdl-plugin.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -101,22 +101,22 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
-			<version>2.3.2</version>
+			<version>2.3.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>jquery</artifactId>
-			<version>2.2.4</version>
+			<version>3.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>ace</artifactId>
-			<version>1.2.3</version>
+			<version>1.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>9.4.9.v20180320</version>
+			<version>9.4.34.v20201102</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

com.minres.rdl.parent/com.minres.rdl/.gitignore

@@ -2,3 +2,4 @@
 /Run RDL Generator DBT-RISCV.launch
 /Run RDL Generator SC-Components-Test.launch
 /plugin.xml_gen
+/model/

com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.rdl
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: com.minres.rdl; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
@@ -14,9 +14,10 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.emf.common,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
- org.antlr.runtime,
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.eclipse.equinox.preferences
+ org.eclipse.equinox.preferences,
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.emf.mwe.utils
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.rdl,
  com.minres.rdl.generator,
  com.minres.rdl.parser.antlr,

com.minres.rdl.parent/com.minres.rdl/pom.xml

@@ -14,7 +14,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.4.0</version>
+				<version>1.6.0</version>
 				<executions>
 					<execution>
 						<id>mwe2Launcher</id>
@@ -39,7 +39,7 @@
 					<dependency>
 						<groupId>org.eclipse.emf</groupId>
 						<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
-						<version>2.9.1.201705291010</version>
+						<version>${mwe2Version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
@@ -59,7 +59,7 @@
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>xtext-antlr-generator</artifactId>
-						<version>[2.1.1, 3)</version>
+						<version>2.1.1</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -152,5 +152,5 @@
 		</pluginManagement>
 	</build>
 
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 </project>

com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2

@@ -30,7 +30,7 @@ Workflow {
 				encoding = "UTF-8"
 				lineDelimiter = "\n"
 				fileHeader = "/*\n * generated by Xtext \${version}\n */"
-				preferXtendStubs = false
+				preferXtendStubs = true
 			}
 		}
 		language = StandardLanguage {
@@ -48,25 +48,24 @@ Workflow {
 			formatter = {
 				generateStub = true
 			}
-
 			serializer = {
 				generateStub = false
 			}
-
 			validator = {
 				composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
 				// composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
 				// Generates checks for @Deprecated grammar annotations, an IssueProvider and a corresponding PropertyPage
 				generateDeprecationValidation = true
 			}
-
 			generator = {
                 		generateXtendMain = true
 			}
-
 			projectWizard = {
 		            	generate = true
 			}
+			generator = {
+				generateXtendStub = true
+			}
 			junitSupport = {
 				junitVersion = "5"
 			}

com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend

@@ -8,7 +8,6 @@ import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.eclipse.emf.mwe.utils.ProjectMapping
 import org.eclipse.emf.mwe.utils.StandaloneSetup
-import org.eclipse.xtext.generator.GeneratorContext
 import org.eclipse.xtext.generator.GeneratorDelegate
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess
 import org.eclipse.xtext.resource.XtextResource
@@ -20,6 +19,7 @@ import java.text.ParseException
 import com.minres.rdl.generator.Options.Multiplicity
 import com.minres.rdl.generator.Options.Separator
 import org.eclipse.xtext.generator.IFileSystemAccess
+import java.io.File
 
 class Main {
 
@@ -74,12 +74,12 @@ class Main {
             return
         }
         val verbose = if(opt.getSet().isSet("v")) true else false;
-
+        val setup = new StandaloneSetup()
         if (opt.getSet().isSet("I")) {
             val projectMapping = new ProjectMapping
             projectMapping.projectName = "RDL Repository"
-            projectMapping.path = opt.getSet().getOption("I").getResultValue(0)
+            projectMapping.path = new File(opt.getSet().getOption("I").getResultValue(0)).canonicalFile.absolutePath
-            new StandaloneSetup().addProjectMapping(projectMapping)
+            setup.addProjectMapping(projectMapping)
         }
         // Configure and start the generator
         fileAccess.outputPath = 'src-gen/'

com.minres.rdl.parent/pom.xml

@@ -7,18 +7,19 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<xtextVersion>2.14.0</xtextVersion>
+		<xtextVersion>2.25.0</xtextVersion>
+		<mwe2Version>2.12.1</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.target>11</maven.compiler.target>
 		<!-- Tycho settings -->
-		<tycho-version>1.1.0</tycho-version>
+		<tycho-version>1.7.0</tycho-version>
 		<!-- Define overridable properties for tycho-surefire-plugin -->
 		<platformSystemProperties></platformSystemProperties>
 		<moduleProperties></moduleProperties>
 		<systemProperties></systemProperties>
-		<tycho.testArgLine></tycho.testArgLine>
+		<additionalTestArguments></additionalTestArguments>
-		<rdl-plugin-version>1.1.1-SNAPSHOT</rdl-plugin-version>
+		<rdl-plugin.version>1.3.0-SNAPSHOT</rdl-plugin.version>
 	</properties>
 	<modules>
 		<module>com.minres.rdl</module>
@@ -36,6 +37,17 @@
 		<module>com.minres.rdl.product.releng</module>
 		<module>com.minres.rdl.standalone</module>
 	</modules>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.eclipse.xtext</groupId>
+				<artifactId>xtext-dev-bom</artifactId>
+				<version>${xtextVersion}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<build>
 		<plugins>
 			<plugin>
@@ -44,11 +56,6 @@
 				<version>${tycho-version}</version>
 				<extensions>true</extensions>
 			</plugin>
-			<plugin>
-			    <groupId>org.eclipse.tycho</groupId>
-			    <artifactId>tycho-versions-plugin</artifactId>
-			    <version>${tycho-version}</version>
-			</plugin>
 			<plugin>
 			    <groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
@@ -120,6 +127,23 @@
 							<arch>x86_64</arch>
 						</environment>
 					</environments>
+					<dependency-resolution>
+						<extraRequirements>
+							<requirement>
+								<type>eclipse-plugin</type>
+								<id>org.eclipse.xtext.logging</id>
+								<versionRange>1.2.15</versionRange>
+							</requirement>
+							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target 
+								platform is Luna or later. (backward compatible with kepler and previous 
+								versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.rcp</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+					</dependency-resolution>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -147,7 +171,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.5</version>
+					<version>3.1.0</version>
 					<configuration>
 						<filesets>
 							<fileset>
@@ -166,26 +190,6 @@
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-resources-plugin
-										</artifactId>
-										<versionRange>
-											[2.4.3,)
-										</versionRange>
-										<goals>
-											<goal>resources</goal>
-											<goal>testResources</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
 								<pluginExecution>
 									<pluginExecutionFilter>
 										<groupId>
@@ -276,7 +280,7 @@
 					<version>${tycho-version}</version>
 					<configuration>
 						<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
-						<argLine>${tycho.testArgLine} ${platformSystemProperties} ${systemProperties} ${moduleProperties}</argLine>
+						<argLine>${platformSystemProperties} ${systemProperties} ${moduleProperties} ${additionalTestArguments}</argLine>
 						<failIfNoTests>false</failIfNoTests>
 						<useUIHarness>false</useUIHarness>
 					</configuration>