9 files changed, 50 insertions, 189 deletions

diff --git a/gradle/java-common.gradle b/gradle/java-common.gradle
deleted file mode 100644
index 0a63cfe1..00000000
--- a/gradle/java-common.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-repositories {
-        mavenCentral()
-        maven {
-                url 'https://repo.eclipse.org/content/groups/releases/'
-        }
-}
-
-sourceCompatibility = '17'
-targetCompatibility = '17'
-
-tasks.named('jar') {
-        manifest {
-                attributes 'Bundle-SymbolicName': project.name
-        }
-}
-
-apply plugin: 'eclipse'
-
-def generateEclipseSourceFolders = tasks.register('generateEclipseSourceFolders')
-
-tasks.register('prepareEclipse') {
-        dependsOn generateEclipseSourceFolders
-        dependsOn tasks.named('eclipseJdt')
-}
-
-tasks.named('eclipseClasspath') {
-        dependsOn generateEclipseSourceFolders
-}
-
-eclipse {
-        classpath.file.whenMerged {
-                for (entry in entries) {
-                        if (entry.path.endsWith('-gen')) {
-                                entry.entryAttributes['ignore_optional_problems'] = true
-                        }
-                }
-        }
-
-        jdt.file.withProperties { properties ->
-                // Allow @SupperessWarnings to suppress SonarLint warnings
-                properties['org.eclipse.jdt.core.compiler.problem.unhandledWarningToken'] = 'ignore'
-        }
-}
diff --git a/gradle/jmh.gradle b/gradle/jmh.gradle
deleted file mode 100644
index 698a57cf..00000000
--- a/gradle/jmh.gradle
+++ /dev/null
@@ -1,53 +0,0 @@
-configurations {
-        jmh {
-                extendsFrom implementation
-        }
-}
-
-sourceSets {
-        jmh {
-                java.srcDirs = ['src/jmh/java']
-        resources.srcDirs = ['src/jmh/resources']
-        compileClasspath += sourceSets.main.runtimeClasspath
-        compileClasspath += sourceSets.test.runtimeClasspath
-        }
-}
-
-dependencies {
-        jmhImplementation "org.openjdk.jmh:jmh-core:${jmhVersion}"
-        jmhAnnotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:${jmhVersion}"
-}
-
-tasks.register('jmh', JavaExec) {
-        dependsOn tasks.named('jmhClasses')
-    main = 'org.openjdk.jmh.Main'
-    classpath = sourceSets.jmh.compileClasspath + sourceSets.jmh.runtimeClasspath
-}
-
-eclipse.classpath {
-        plusConfigurations += [configurations.jmhCompileClasspath, configurations.jmhRuntimeClasspath]
-
-        file.whenMerged { classpath ->
-                for (entry in classpath.entries) {
-                        // Workaround from https://github.com/gradle/gradle/issues/4802#issuecomment-407902081
-                        if (entry in org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry) {
-                                def usedBy = (entry.entryAttributes['gradle_used_by_scope'] ?: '').split(',')
-                                if (usedBy == ['jmh']) {
-                                        // Allow test helper classes to be used in benchmarks from Eclipse
-                                        // and do not expose JMH dependencies to the main source code.
-                                        entry.entryAttributes['test'] = true
-                                } else if ((usedBy.contains('main') || usedBy.contains('test')) && !usedBy.contains('jmh')) {
-                                        // main and test sources are also used by jmh sources.
-                                        usedBy += 'jmh'
-                                        entry.entryAttributes['gradle_used_by_scope'] = usedBy.join(',')
-                                }
-                        }
-                }
-        }
-}
-
-sonarqube.properties {
-        properties['sonar.tests'] += [
-                'src/jmh/java',
-        ]
-}
diff --git a/gradle/junit.gradle b/gradle/junit.gradle
deleted file mode 100644
index 44a463c7..00000000
--- a/gradle/junit.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'jacoco'
-
-dependencies {
-        testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
-        testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
-        testImplementation "org.hamcrest:hamcrest:${hamcrestVersion}"
-        testImplementation "org.mockito:mockito-core:${mockitoVersion}"
-        testImplementation "org.mockito:mockito-junit-jupiter:${mockitoVersion}"
-}
-
-def jacocoTestReport = tasks.named('jacocoTestReport')
-jacocoTestReport.configure {
-        dependsOn test
-        reports {
-                xml.required = true
-        }
-}
-
-tasks.named('test') {
-        useJUnitPlatform {
-                excludeTags 'slow'
-        }
-        finalizedBy jacocoTestReport
-}
-
-tasks.register('slowTest', Test) {
-        useJUnitPlatform()
-        finalizedBy jacocoTestReport
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..c0372cad
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,49 @@
+[versions]
+jetty = "11.0.7"
+jmh = "1.33"
+junit = "5.8.2"
+mockito = "4.1.0"
+mwe2 = "2.12.2.M1"
+slf4j = "2.0.0-alpha5"
+xtext = "2.26.0.M2"
+
+[libraries]
+ecore = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore", version = "2.25.0" }
+ecore-xmi = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore.xmi", version = "2.16.0" }
+ecore-codegen = { group = "org.eclipse.emf", name = "org.eclipse.emf.codegen.ecore", version = "2.28.0" }
+gradlePlugin-frontend = { group = "org.siouan", name = "frontend-gradle-plugin-jdk11", version = "6.0.0" }
+gradlePlugin-shadow = { group = "gradle.plugin.com.github.johnrengelman", name = "shadow", version = "7.1.0" }
+gradlePlugin-sonarqube = { group = "org.sonarsource.scanner.gradle", name = "sonarqube-gradle-plugin", version = "3.3" }
+gradlePlugin-xtend = { group = "org.xtext", name = "xtext-gradle-plugin", version = "3.0.0" }
+hamcrest = { group = "org.hamcrest", name = "hamcrest", version = "2.2" }
+jetty-server = { group = "org.eclipse.jetty", name = "jetty-server", version.ref = "jetty" }
+jetty-servlet = { group = "org.eclipse.jetty", name = "jetty-servlet", version.ref = "jetty" }
+jetty-websocket-client = { group = "org.eclipse.jetty.websocket", name = "websocket-jetty-client", version.ref = "jetty" }
+jetty-websocket-server = { group = "org.eclipse.jetty.websocket", name = "websocket-jetty-server", version.ref = "jetty" }
+jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
+jmh-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }
+junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }
+junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
+junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" }
+mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
+mockito-junit = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" }
+mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.6.2.M1" }
+mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" }
+mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" }
+slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
+slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" }
+viatra = { group = "org.eclipse.viatra", name = "viatra-query-runtime", version = "2.6.0" }
+xtend-lib = { group = "org.eclipse.xtend", name = "org.eclipse.xtend.lib", version.ref = "xtext" }
+xtext-bom = { group = "org.eclipse.xtext", name = "xtext-dev-bom", version.ref = "xtext" }
+xtext-core = { group = "org.eclipse.xtext", name = "org.eclipse.xtext", version.ref = "xtext" }
+xtext-generator-antlr = { group = "org.eclipse.xtext", name = "xtext-antlr-generator", version = "2.1.1" }
+xtext-generator = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xtext.generator", version.ref = "xtext" }
+xtext-ide = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.ide", version.ref = "xtext" }
+xtext-testing = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.testing", version.ref = "xtext" }
+xtext-web = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.web", version.ref = "xtext" }
+xtext-xbase = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xbase", version.ref = "xtext" }
+xtext-xbase-ide = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xbase.ide", version.ref = "xtext" }
+
+[plugins]
+versions = { id = "com.github.ben-manes.versions", version = "0.39.0" }
diff --git a/gradle/mwe2.gradle b/gradle/mwe2.gradle
deleted file mode 100644
index b4ea8bb8..00000000
--- a/gradle/mwe2.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-configurations {
-        mwe2 {
-                extendsFrom implementation
-        }
-}
-
-dependencies {
-        mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:${mwe2Version}"
-}
-
-eclipse.classpath.plusConfigurations += [configurations.mwe2]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf0..7454180f 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a25..84d1f85f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/xtend.gradle b/gradle/xtend.gradle
deleted file mode 100644
index db1c2a57..00000000
--- a/gradle/xtend.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-apply plugin: 'org.xtext.xtend'
-
-sourceSets {
-        main {
-                xtendOutputDir = 'src/main/xtend-gen'
-        }
-        test {
-                xtendOutputDir = 'src/test/xtend-gen'
-        }
-}
-
-xtend.generator {
-        // As of Xtext 2.26.0.M2, the Xbase compiler doesn't know how to handle Java 12 and up
-        // and the build fails with a NullPointerException if such Java version is specified.
-        javaSourceLevel = '11'
-}
-
-tasks.named('clean') {
-        delete 'src/main/xtend-gen'
-        delete 'src/test/xtend-gen'
-}
-
-sonarqube.properties {
-        properties['sonar.exclusions'] += [
-                'src/main/xtend-gen/**',
-                'src/test/xtend-gen/**',
-        ]
-}
-
-tasks.named('generateEclipseSourceFolders') {
-        dependsOn tasks.named('generateXtext')
-        dependsOn tasks.named('generateTestXtext')
-}
diff --git a/gradle/xtext-common.gradle b/gradle/xtext-common.gradle
deleted file mode 100644
index 09980a90..00000000
--- a/gradle/xtext-common.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-apply from: "${rootDir}/gradle/java-common.gradle"
-
-sourceSets {
-        main {
-                java.srcDirs += ['src/main/xtext-gen']
-                resources.srcDirs += ['src/main/xtext-gen']
-        }
-}
-
-tasks.named('clean') {
-        delete 'src/main/xtext-gen'
-}
-
-sonarqube.properties {
-        properties['sonar.exclusions'] += [
-                'src/main/xtext-gen/**',
-        ]
-}