Code Review
/
odlparent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Upgrade org.ow2.asm 5.0.4 -> 5.1"
[odlparent.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index 0dee7d1265694350f150e9166a250028d0b6c967..7d5df89bc5725cb4579e99b1ff4cdb920eab560c 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-11,13
+11,11
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.
6
.0-SNAPSHOT</version>
+ <version>1.
7
.0-SNAPSHOT</version>
<relativePath>odlparent-lite</relativePath>
</parent>
<relativePath>odlparent-lite</relativePath>
</parent>
- <groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-aggregator</artifactId>
<artifactId>odlparent-aggregator</artifactId>
- <version>1.6.0-SNAPSHOT</version>
<name>odlparent</name> <!-- Used by Sonar to set project name -->
<packaging>pom</packaging>
<name>odlparent</name> <!-- Used by Sonar to set project name -->
<packaging>pom</packaging>
@@
-37,6
+35,9
@@
<module>bundle-parent</module>
<module>features-parent</module>
<module>features-test</module>
<module>bundle-parent</module>
<module>features-parent</module>
<module>features-test</module>
+ <module>features-odlparent</module>
+ <module>features-akka</module>
+ <module>odlparent-artifacts</module>
<module>odlparent</module>
<module>odlparent-lite</module>
<module>karaf-plugin</module>
<module>odlparent</module>
<module>odlparent-lite</module>
<module>karaf-plugin</module>
@@
-45,9
+46,7
@@
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
<configuration>
<skip>true</skip>
</configuration>
<configuration>
<skip>true</skip>
</configuration>
@@
-71,8
+70,8
@@
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
<inherited>false</inherited>
<executions>
<execution>
<inherited>false</inherited>
<executions>
<execution>