diff options
author | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2017-02-27 08:01:54 +0100 |
---|---|---|
committer | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2017-02-27 08:01:54 +0100 |
commit | 13d4b5aeb8d5fc381100c31f39fd713dcc9850e1 (patch) | |
tree | 817d79ae343a3aa37ee14aeb6ff917503b77981d /pom.xml | |
parent | 76beaef7ac313675aafa7afc3cec60f289a911a1 (diff) | |
parent | e688583dee96e6a41d03b057234005678732d25f (diff) | |
download | sonarqube-13d4b5aeb8d5fc381100c31f39fd713dcc9850e1.tar.gz sonarqube-13d4b5aeb8d5fc381100c31f39fd713dcc9850e1.zip |
Automatic merge from branch-6.3
* origin/branch-6.3:
BUILD-384 Replace usage of groovy-maven-plugin (not compliant with Maven paraller execution) by beanshell-maven-plugin
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -111,11 +111,6 @@ <version>1.3</version> </plugin> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.4</version> @@ -259,6 +254,11 @@ <artifactId>protobuf-maven-plugin</artifactId> <version>0.5.0</version> </plugin> + <plugin> + <groupId>com.github.genthaler</groupId> + <artifactId>beanshell-maven-plugin</artifactId> + <version>1.2</version> + </plugin> </plugins> </pluginManagement> @@ -316,7 +316,6 @@ <plugin> <groupId>com.github.genthaler</groupId> <artifactId>beanshell-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> <id>randomize-environment</id> |