From 24923deb4cf4cf753b57424976a24070b3d0d292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Galland?= <galland@arakhne.org>
Date: Fri, 31 Jan 2020 17:32:07 +0100
Subject: [PATCH] [maven] The "maven.test.skip" property is read from the
 current session.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Galland <galland@arakhne.org>
---
 .../compiler/AbstractSarlBatchCompilerMojo.java     | 13 +++++++++++--
 .../io/sarl/maven/compiler/AbstractSarlMojo.java    |  8 +-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlBatchCompilerMojo.java b/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlBatchCompilerMojo.java
index d5987577ff..1f8cacc625 100644
--- a/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlBatchCompilerMojo.java
+++ b/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlBatchCompilerMojo.java
@@ -220,8 +220,17 @@ protected MavenProject getProject() {
 
 	@Override
 	protected boolean isSkipped() {
-		if (isTestContext() && this.mavenTestSkip) {
-			return true;
+		if (isTestContext()) {
+			// Check the general Maven test skipping flag
+			boolean mavenTestSkip = false;
+			try {
+				mavenTestSkip = Boolean.parseBoolean(this.session.getUserProperties().getProperty("maven.test.skip", "false")); //$NON-NLS-1$ //$NON-NLS-2$
+			} catch (Throwable exception) {
+				mavenTestSkip = false;
+			}
+			if (mavenTestSkip) {
+				return true;
+			}
 		}
 		return super.isSkipped();
 	}
diff --git a/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlMojo.java b/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlMojo.java
index f2fb61ad3c..4365bea04b 100644
--- a/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlMojo.java
+++ b/main/internalmaven/sarl-maven-plugin/src/main/java/io/sarl/maven/compiler/AbstractSarlMojo.java
@@ -64,17 +64,11 @@ public abstract class AbstractSarlMojo extends AbstractMojo {
 	 */
 	protected MavenHelper mavenHelper;
 
-	/** General Maven flag for skipping tests.
-	 * @since 0.11
-	 */
-	@Parameter(defaultValue = "${maven.test.skip}", required = true, readonly = true)
-	protected boolean mavenTestSkip;
-
 	/**
 	 * The current Maven session.
 	 */
 	@Parameter(defaultValue = "${session}", required = true, readonly = true)
-	private MavenSession session;
+	protected MavenSession session;
 
 	/**
 	 * The Build PluginManager component.