Merge branch 'release/2.0.3'

.github/workflows/maven.yml

@@ -19,3 +19,9 @@ jobs:
         distribution: 'adopt'
     - name: Build and test with Maven
       run: mvn -pl "!com.minres.coredsl.ui.tests" -B verify --file pom.xml
+    - name: Validate Gradle wrapper
+      uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+    - name: Build and test with Gradle
+      uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+      with:
+        arguments: test

.gitignore

@@ -1 +1,2 @@
 /.launch/
+/.gradle/

.project

@@ -5,7 +5,19 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

build.gradle

@@ -0,0 +1,35 @@
+buildscript {
+	repositories {
+		mavenCentral()
+		gradlePluginPortal()
+	}
+	dependencies {
+		classpath 'org.xtext:xtext-gradle-plugin:3.0.1'
+	}
+}
+
+subprojects {
+	ext.xtextVersion = '2.26.0'
+	repositories {
+		mavenCentral()
+	}
+
+	apply plugin: 'java-library'
+	dependencies {
+		api platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
+	}
+
+	apply plugin: 'org.xtext.xtend'
+	apply from: "${rootDir}/gradle/source-layout.gradle"
+	apply plugin: 'eclipse'
+
+	group = 'com.minres.coredsl'
+	version = '2.0.2-SNAPSHOT'
+
+	sourceCompatibility = '11'
+	targetCompatibility = '11'
+
+	configurations.all {
+		exclude group: 'asm'
+	}
+}

com.minres.coredsl.feature/feature.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature id="com.minres.coredsl.feature"
 	label="CoreDsl Feature "
-	version="2.0.2.qualifier">
+	version="2.0.3.qualifier">
 	<plugin
 			id="com.minres.coredsl"
 			download-size="0"

com.minres.coredsl.feature/pom.xml

@@ -4,8 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
-	        <relativePath>..</relativePath>
+		<version>2.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.coredsl.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

com.minres.coredsl.ide/.classpath

@@ -1,9 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" output="bin/main" path="src">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="src-gen">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="xtend-gen">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>

com.minres.coredsl.ide/.gitignore

@@ -4,3 +4,5 @@
 *.xtendbin
 /src-gen/
 /xtend-gen/
+/bin/
+/build/

com.minres.coredsl.ide/.project

@@ -6,7 +6,7 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -16,7 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -33,6 +38,7 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>

com.minres.coredsl.ide/.settings/.gitignore

@@ -0,0 +1,2 @@
+/org.eclipse.xtend.core.Xtend.prefs
+/org.eclipse.xtext.java.Java.prefs

com.minres.coredsl.ide/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,8 @@
+connection.arguments=
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.gradle.user.home=null
+connection.java.home=null
+connection.jvm.arguments=
+connection.project.dir=..
+eclipse.preferences.version=1
+project.path=\:com.minres.coredsl.ide

com.minres.coredsl.ide/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl.ide
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.2.qualifier
+Bundle-Version: 2.0.3.qualifier
 Bundle-SymbolicName: com.minres.coredsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl,

com.minres.coredsl.ide/build.gradle

@@ -0,0 +1,27 @@
+plugins {
+	id 'com.github.johnrengelman.shadow' version '7.1.2'
+}
+
+dependencies {
+	api project(':com.minres.coredsl')
+	api "org.eclipse.xtext:org.eclipse.xtext.ide:${xtextVersion}"
+	api "org.eclipse.xtext:org.eclipse.xtext.xbase.ide:${xtextVersion}"
+}
+
+apply plugin: 'application'
+apply plugin: 'com.github.johnrengelman.shadow'
+mainClassName = "org.eclipse.xtext.ide.server.ServerLauncher"
+
+shadowJar {
+	from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)
+	configurations = [project.configurations.runtimeClasspath]
+	exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA','schema/*',
+		'.options', '.api_description', '*.profile', '*.html', 'about.*', 'about_files/*',
+		'plugin.xml', 'systembundle.properties', 'profile.list')
+	classifier = 'ls'
+	append('plugin.properties')
+	mergeServiceFiles()
+}
+//this is an eclipse plugin project
+eclipseClasspath.enabled=false
+cleanEclipseClasspath.enabled=false

com.minres.coredsl.ide/pom.xml

@@ -4,8 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
-	        <relativePath>..</relativePath>
+		<version>2.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.coredsl.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>
@@ -48,7 +47,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.1</version>
+				<version>3.2.0</version>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>
@@ -118,7 +117,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.1</version>
+				<version>3.2.4</version>
 				<configuration>
 					<transformers>
 						<transformer
@@ -129,6 +128,9 @@
 							implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 							<resource>plugin.properties</resource>
 						</transformer>
+						<transformer 
+							implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
+						</transformer>
 					</transformers>
 					<artifactSet>
 						<excludes><!-- avoid duplicate inclusion due to addjars plugin -->

com.minres.coredsl.ide/src/com/minres/coredsl/ide/CoreDslIdeModule.java

@@ -0,0 +1,11 @@
+/*
+ * generated by Xtext 2.26.0
+ */
+package com.minres.coredsl.ide;
+
+
+/**
+ * Use this class to register ide components.
+ */
+public class CoreDslIdeModule extends AbstractCoreDslIdeModule {
+}

com.minres.coredsl.ide/src/com/minres/coredsl/ide/CoreDslIdeSetup.java

@@ -0,0 +1,22 @@
+/*
+ * generated by Xtext 2.26.0
+ */
+package com.minres.coredsl.ide;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.minres.coredsl.CoreDslRuntimeModule;
+import com.minres.coredsl.CoreDslStandaloneSetup;
+import org.eclipse.xtext.util.Modules2;
+
+/**
+ * Initialization support for running Xtext languages as language servers.
+ */
+public class CoreDslIdeSetup extends CoreDslStandaloneSetup {
+
+	@Override
+	public Injector createInjector() {
+		return Guice.createInjector(Modules2.mixin(new CoreDslRuntimeModule(), new CoreDslIdeModule()));
+	}
+
+}

com.minres.coredsl.repository/pom.xml

@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<version>2.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.coredsl.repository</artifactId>
 	<packaging>eclipse-repository</packaging>
@@ -37,7 +34,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore />
+										<ignore></ignore>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -46,15 +43,6 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-
-		<extensions>
-			<!-- Enabling the use of FTP -->
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-ftp</artifactId>
-				<version>1.0-beta-6</version>
-			</extension>
-		</extensions>
 	</build>
 	<profiles>
 		<profile>