aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-11-25 10:54:56 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-11-30 19:01:45 +0100
commitbba16edb777a69137b3122dfbc5b898049f274c5 (patch)
tree17be034a5b93b109d2dd1148398225f77875e56b /pom.xml
parent08dbeeee650d4792b6aaabb109ccd9504d282804 (diff)
downloadsonarqube-bba16edb777a69137b3122dfbc5b898049f274c5.tar.gz
sonarqube-bba16edb777a69137b3122dfbc5b898049f274c5.zip
SONAR-7054 use ws-client in batch
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml15
1 files changed, 5 insertions, 10 deletions
diff --git a/pom.xml b/pom.xml
index b1d4a957d20..598fbdbcc1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
<slf4j.version>1.7.12</slf4j.version>
<tomcat.version>8.0.18</tomcat.version>
<elasticsearch.version>1.7.2</elasticsearch.version>
+ <okhttp.version>2.6.0</okhttp.version>
<protobuf.version>3.0.0-beta-1</protobuf.version>
<protobuf.compiler>${settings.localRepository}/com/google/protobuf/protoc/${protobuf.version}/protoc-${protobuf.version}-${os.detected.classifier}.exe</protobuf.compiler>
@@ -1342,9 +1343,6 @@
<exists>src/main/protobuf</exists>
</file>
</activation>
- <properties>
- <sonar.exclusions>target/generated-sources/protobuf/**/*</sonar.exclusions>
- </properties>
<build>
<plugins>
<plugin>
@@ -1352,7 +1350,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>protobuf-compile</id>
+ <id>compile-protobuf-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
@@ -1389,7 +1387,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>protobuf-compile</id>
+ <id>add-protobuf-generated-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
@@ -1412,9 +1410,6 @@
<exists>src/test/protobuf</exists>
</file>
</activation>
- <properties>
- <sonar.test.exclusions>target/generated-test-sources/protobuf/**/*</sonar.test.exclusions>
- </properties>
<build>
<plugins>
<plugin>
@@ -1422,7 +1417,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>protobuf-test-compile</id>
+ <id>compile-protobuf-tests</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
@@ -1459,7 +1454,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>protobuf-test-compile</id>
+ <id>add-protobuf-generated-tests</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>