aboutsummaryrefslogtreecommitdiffstats
path: root/framework/src/onos/pom.xml
diff options
context:
space:
mode:
authorAshlee Young <ashlee@wildernessvoice.com>2015-11-22 10:02:05 -0800
committerAshlee Young <ashlee@wildernessvoice.com>2015-11-22 10:02:05 -0800
commit77ce3be7567bd01c66d8ee88a93b485666723501 (patch)
tree283e7f39a501750bbd705fbb91645b20198900f1 /framework/src/onos/pom.xml
parent00e6500d0813dcbccaaa741ef38cc1eae6d11e07 (diff)
Removed patch path since changes have been merged upstream to a different path. Updated README with directions.
Change-Id: Ie419abd2d3d3ef7315de9f607dcd757a78190995 Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/onos/pom.xml')
-rw-r--r--framework/src/onos/pom.xml25
1 files changed, 19 insertions, 6 deletions
diff --git a/framework/src/onos/pom.xml b/framework/src/onos/pom.xml
index 89930f59..78fbcf2d 100644
--- a/framework/src/onos/pom.xml
+++ b/framework/src/onos/pom.xml
@@ -39,15 +39,15 @@
<description>Open Network Operating System root project</description>
<modules>
+ <module>tools/package/maven-plugin</module>
<module>utils</module>
<module>core</module>
<module>web</module>
<module>cli</module>
- <module>openflow</module>
+ <module>protocols</module>
+ <!-- FIXME move to protocols/ -->
<module>ovsdb</module>
- <module>netconf</module>
- <module>pcep</module>
<module>bgp</module>
<module>providers</module>
@@ -545,7 +545,20 @@
<rerunFailingTestsCount>1</rerunFailingTestsCount>
</configuration>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ <configuration>
+ <tags>
+ <tag>
+ <name>rsModel</name>
+ <placement>m</placement>
+ <head>Json model for REST api:</head>
+ </tag>
+ </tags>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -631,8 +644,8 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
+ <version>1.6-SNAPSHOT</version>
+ <executions>
<execution>
<id>cfg</id>
<phase>generate-resources</phase>