116: Use Xtext build utils

Task-Url: #116
LorenzoBettini · Jun 28, 2021 · b231f83 · b231f83
1 parent 9888a57
commit b231f83
Show file tree

Hide file tree

Showing 15 changed files with 171 additions and 571 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -41,7 +41,7 @@ jobs:
       run: >
         xvfb-run
         mvn -f javamm.parent/pom.xml
-        verify -Pide-tests -Pjacoco-report
+        verify -Pide-tests -Pjacoco
         -DrepoToken=$COVERALLS_REPO_TOKEN
         -DpullRequest=${{ github.event.pull_request.number }}
         -Dsonar.organization=lorenzobettini-github

diff --git a/javamm.eclipse.sdk/pom.xml b/javamm.eclipse.sdk/pom.xml
@@ -1,16 +1,17 @@
 <?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"
-	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>
+<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>
-		<relativePath>../javamm.parent/pom.xml</relativePath>
-		<groupId>javamm</groupId>
-		<artifactId>javamm.parent</artifactId>
-		<version>1.11.0-SNAPSHOT</version>
-	</parent>
+  <parent>
+    <relativePath>../javamm.parent/pom.xml</relativePath>
+    <groupId>javamm</groupId>
+    <artifactId>javamm.parent</artifactId>
+    <version>1.11.0-SNAPSHOT</version>
+  </parent>
 
-	<artifactId>javamm.eclipse.sdk</artifactId>
-	<packaging>eclipse-plugin</packaging>
+  <artifactId>javamm.eclipse.sdk</artifactId>
+  <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/javamm.examples/pom.xml b/javamm.examples/pom.xml
@@ -36,7 +36,7 @@
 			<plugin>
 				<groupId>org.eclipse.xtext</groupId>
 				<artifactId>xtext-maven-plugin</artifactId>
-				<version>${xtext.version}</version>
+				<version>${xtext-version}</version>
 				<executions>
 					<execution>
 						<goals>

diff --git a/javamm.parent/launches/javamm.parent Jacoco Report.launch b/javamm.parent/launches/javamm.parent Jacoco Report.launch
@@ -4,7 +4,7 @@
 <stringAttribute key="M2_GOALS" value="clean verify"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
 <booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="jacoco-report"/>
+<stringAttribute key="M2_PROFILES" value="jacoco"/>
 <listAttribute key="M2_PROPERTIES"/>
 <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
 <booleanAttribute key="M2_SKIP_TESTS" value="false"/>

diff --git a/javamm.parent/launches/javamm.parent Sonarqube.launch b/javamm.parent/launches/javamm.parent Sonarqube.launch
@@ -4,7 +4,7 @@
 <stringAttribute key="M2_GOALS" value="clean verify sonar:sonar"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
 <booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="jacoco-report ide-tests"/>
+<stringAttribute key="M2_PROFILES" value="jacoco ide-tests"/>
 <listAttribute key="M2_PROPERTIES"/>
 <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
 <booleanAttribute key="M2_SKIP_TESTS" value="false"/>