[maven] Refactor sarl-maven-plugin for using the batch compiler.

see #504 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Oct 10, 2016 · 859dd1b · 859dd1b
1 parent e8d419a
commit 859dd1b
Show file tree

Hide file tree

Showing 15 changed files with 737 additions and 381 deletions.
diff --git a/maven/sarl-maven-plugin/generate_pom.pl b/maven/sarl-maven-plugin/generate_pom.pl
diff --git a/maven/sarl-maven-plugin/pom.xml b/maven/sarl-maven-plugin/pom.xml
@@ -1,7 +1,3 @@
-<!-- *******************************************************
-   * This file is automatically generated. Do not change it. *
-     ******************************************************* -->
-
 <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>
@@ -17,25 +13,13 @@
 	<packaging>maven-plugin</packaging>
 
 	<properties>
-		<!-- Needed for replacements in config.properties -->
 		<dependency.sarl-sdk.groupId>io.sarl.lang</dependency.sarl-sdk.groupId>
 		<dependency.sarl-sdk.artifactId>io.sarl.lang.core</dependency.sarl-sdk.artifactId>
-		<dependency.xtext-compiler.groupId>org.eclipse.xtext</dependency.xtext-compiler.groupId>
-		<dependency.xtext-compiler.artifactId>xtext-maven-plugin</dependency.xtext-compiler.artifactId>
-		<dependency.xtext-compiler.mojo>generate</dependency.xtext-compiler.mojo>
-		<dependency.xtext-compiler.dependencies>
-		io.sarl.lang:io.sarl.lang, io.sarl.lang:io.sarl.lang.core, org.eclipse:osgi, org.eclipse.xtend:org.eclipse.xtend.core
-		</dependency.xtext-compiler.dependencies>
-		<dependency.java-compiler.groupId>org.apache.maven.plugins</dependency.java-compiler.groupId>
-		<dependency.java-compiler.artifactId>maven-compiler-plugin</dependency.java-compiler.artifactId>
-		<dependency.java-compiler.mojo>compile</dependency.java-compiler.mojo>
 		<dependency.cleaner.groupId>org.apache.maven.plugins</dependency.cleaner.groupId>
 		<dependency.cleaner.artifactId>maven-clean-plugin</dependency.cleaner.artifactId>
 		<dependency.cleaner.mojo>clean</dependency.cleaner.mojo>
 	</properties>
 
-	<!-- The dependencies contains the ones required for compiling and running this plugin,
-	     AND the plugins that are required for running the SARL compiler. -->
 	<dependencies>
 		<!-- The following dependencies are required for compiling this maven plugin -->
 		<dependency>
@@ -56,55 +40,13 @@
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-compiler-plugin</artifactId>
 		</dependency>
-		<!-- The following dependencies are required for compiling SARL code with this maven plugin -->
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-clean-plugin</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.xtext</groupId>
-			<artifactId>xtext-maven-plugin</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>io.sarl.lang</groupId>
-			<artifactId>io.sarl.lang</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>io.sarl.lang</groupId>
-			<artifactId>io.sarl.lang.core</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse</groupId>
-			<artifactId>osgi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.xtend</groupId>
-			<artifactId>org.eclipse.xtend.core</artifactId>
-		</dependency>
-
-		<!-- The following dependencies are required for testing this maven plugin -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.shared</groupId>
-			<artifactId>maven-verifier</artifactId>
-			<scope>test</scope>
+			<groupId>io.sarl.maven</groupId>
+			<artifactId>io.sarl.maven.batchcompiler</artifactId>
 		</dependency>
 	</dependencies>
 
@@ -114,10 +56,6 @@
 				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
 			</resource>
-			<resource>
-				<directory>src/test/resources</directory>
-				<filtering>true</filtering>
-			</resource>
 		</resources>
 		<plugins>
 			<plugin>

diff --git a/maven/sarl-maven-plugin/src-templates/pom.template b/maven/sarl-maven-plugin/src-templates/pom.template
diff --git a/...n-plugin/src-templates/functional_pom.xml → ...aven-plugin/src-templates/working_pom.xml b/...n-plugin/src-templates/functional_pom.xml → ...aven-plugin/src-templates/working_pom.xml