From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 7 Apr 2015 20:10:22 +0000 (+0200)
Subject: Replace GMavenPlus by beanshell
X-Git-Tag: 5.2-RC1~2348
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c909c60468416fa2375c9f9e1282ffa11b834783;p=sonarqube.git

Replace GMavenPlus by beanshell

I'm afraid of the side-effects of the required property "allowSystemExits" of GMavenPlus (yet another groovy maven plugin)
---

diff --git a/pom.xml b/pom.xml
index c57694d1836..6ec2d1c6be8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,39 +418,28 @@
       early the tests that are coupled with local environment.
       -->
       <plugin>
-        <groupId>org.codehaus.gmavenplus</groupId>
-        <artifactId>gmavenplus-plugin</artifactId>
-        <version>1.5</version>
+        <groupId>com.github.genthaler</groupId>
+        <artifactId>beanshell-maven-plugin</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <id>randomize-environment</id>
             <phase>validate</phase>
             <goals>
-              <goal>execute</goal>
+              <goal>run</goal>
             </goals>
             <configuration>
-              <scripts>
-                <script>
-                  <![CDATA[
-                String[] timezones = ["GMT-9", "UTC", "GMT+9"];
-                String testTimezone = timezones[new Random().nextInt(timezones.length)];
-                project.properties['testTimezone'] = testTimezone;
-                log.info('Timezone used for tests: ' + testTimezone);
+              <script>
+                <![CDATA[
+                String[] timezones = new String[] {"GMT-9", "UTC", "GMT+9"};
+                String testTimezone = timezones[new java.util.Random().nextInt(timezones.length)];
+                project.getProperties().setProperty("testTimezone", testTimezone);
+                logger.info("Timezone used for tests: " + testTimezone);
                 ]]>
-                </script>
-              </scripts>
+              </script>
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <!-- any version of Groovy \>= 1.5.0 should work here -->
-            <version>2.4.1</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>