Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Added comments to the opendaylight-inventory.yang file to help describe the...
[controller.git]
/
opendaylight
/
config
/
pom.xml
diff --git
a/opendaylight/config/pom.xml
b/opendaylight/config/pom.xml
index 4660091fcc217c53dc8a8279dc37cd002de5ba79..a8a4c87a4eaa9f28a3e6656390bb27accbdd1f67 100644
(file)
--- a/
opendaylight/config/pom.xml
+++ b/
opendaylight/config/pom.xml
@@
-80,12
+80,11
@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>
1.3
</version>
+ <version>
${maven.antrun.plugin.version}
</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
<executions>
<execution>
<goals>
@@
-98,7
+97,6
@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.14.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<parallel>classes</parallel>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<parallel>classes</parallel>
@@
-111,7
+109,7
@@
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>
1.0
</version>
+ <version>
${gmaven.plugin.version}
</version>
</plugin>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
</plugin>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
@@
-154,7
+152,6
@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.12</version>
<configuration>
<failsOnError>false</failsOnError>
<failOnViolation>false</failOnViolation>
<configuration>
<failsOnError>false</failsOnError>
<failOnViolation>false</failOnViolation>
@@
-229,4
+226,4
@@
</modules>
</profile>
</profiles>
</modules>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>