Merge pull request #372 from jmtd/OPENJDK-1549-maven-args-take-2

Openjdk 1549 maven args take 2

Author: jmtd

modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh

@@ -74,8 +74,11 @@ function maven_build() {
   log_info "Using MAVEN_OPTS ${MAVEN_OPTS}"
   log_info "Using $(mvn $MAVEN_ARGS --version)"
   log_info "Running 'mvn $MAVEN_ARGS $goals'"
-  # Execute the actual build
-  mvn $MAVEN_ARGS $goals
+
+  # Execute the actual build (ensuring MAVEN_ARGS is unset, OPENJDK-1549)
+  REAL_MAVEN_ARGS="$MAVEN_ARGS"
+  unset MAVEN_ARGS
+  mvn $REAL_MAVEN_ARGS $goals
 
   popd &> /dev/null
 

tests/OPENJDK-1549/README.md

@@ -0,0 +1,18 @@
+# Test for OPENJDK-1549
+
+<https://issues.redhat.com/browse/OPENJDK-1549>
+
+This is a minimal Maven project for which the `validate` target will fail
+if the environment variable `MAVEN_ARGS` is defined.
+
+This is achieved using the Enforcer plugin. We could not use the
+`requireEnvironmentVariable` built-in rule as it can only fail if a variable
+is undefined, rather than if it is. Instead we use `evaluateBeanshell` and
+a very short Beanshell expression.
+
+Maven expands strings of the form `${env.foo}` within the POM only if the
+variable is defined. That is, when `MAVEN_ARGS` is not defined in the
+environment, the string `${env.MAVEN_ARGS}` is passed through unaltered.
+If the variable is defined (including defined but empty), Maven will expand
+it. Some string concatenation trickery is needed to match against the
+un-expanded form.

tests/OPENJDK-1549/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>getting-started</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.3.0</version>
+        <executions>
+
+          <!-- ensure the environment variable MAVEN_ARGS is unset -->
+          <execution>
+            <id>enforce-beanshell</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <evaluateBeanshell>
+                  <condition>"${env.MAVEN_ARGS}".equals("${env."+"MAVEN_ARGS}")</condition>
+                </evaluateBeanshell>
+              </rules>
+              <fail>true</fail>
+            </configuration>
+          </execution>
+
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

tests/features/java/java_s2i.feature

@@ -166,3 +166,8 @@ Feature: Openshift OpenJDK S2I tests
        | ns     | http://maven.apache.org/SETTINGS/1.0.0 |
     Then XML file /tmp/artifacts/configuration/settings.xml should have 1 elements on XPath //ns:server[ns:id='myrepo']
     Then XML file /tmp/artifacts/configuration/settings.xml should have 1 elements on XPath //ns:profile[ns:id='myrepo-profile']/ns:repositories/ns:repository[ns:url='http://repo.example.com:8080/maven2/']
+
+  Scenario: Ensure the environment is cleaned when executing mvn (OPENJDK-1549)
+      Given s2i build https://github.com/jmtd/openjdk from tests/OPENJDK-1549 with env using OPENJDK-1549-maven-args-take-2
+       | variable           | value    |
+       | MAVEN_ARGS         | validate |