diff options
Diffstat (limited to 'framework/src/onos/pom.xml')
-rw-r--r-- | framework/src/onos/pom.xml | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/framework/src/onos/pom.xml b/framework/src/onos/pom.xml index 4d49abaa..c72a4594 100644 --- a/framework/src/onos/pom.xml +++ b/framework/src/onos/pom.xml @@ -39,16 +39,12 @@ <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>protocols</module> - <!-- FIXME move to protocols/ --> - <module>bgp</module> - <module>providers</module> <module>drivers</module> @@ -58,7 +54,6 @@ <module>tools/package/archetypes</module> <module>tools/package/branding</module> - <module>tools/build/conf</module> </modules> <url>http://onosproject.org/</url> @@ -79,10 +74,11 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <onos-build-conf.version>1.1-SNAPSHOT</onos-build-conf.version> + <onos-build-conf.version>1.1</onos-build-conf.version> <netty4.version>4.0.23.Final</netty4.version> <copycat.version>0.5.0.onos</copycat.version> - <openflowj.version>0.9.0.onos</openflowj.version> + <!-- FIXME update to release version before Emu release --> + <openflowj.version>0.9.2.onos-SNAPSHOT</openflowj.version> <karaf.version>3.0.3</karaf.version> <jersey.version>1.19</jersey.version> </properties> @@ -94,6 +90,14 @@ </snapshotRepository> </distributionManagement> + <!-- FIXME remove before Emu release --> + <repositories> + <repository> + <id>snapshots</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </repository> + </repositories> + <dependencyManagement> <dependencies> <dependency> @@ -558,7 +562,7 @@ <configuration> <tags> <tag> - <name>rsModel</name> + <name>onos.rsModel</name> <placement>m</placement> <head>Json model for REST api:</head> </tag> @@ -650,7 +654,7 @@ <plugin> <groupId>org.onosproject</groupId> <artifactId>onos-maven-plugin</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> <executions> <execution> <id>cfg</id> @@ -694,12 +698,6 @@ <artifactId>onos-build-conf</artifactId> <version>${onos-build-conf.version}</version> </dependency> - <!-- For Java 8 lambda support--> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>5.9</version> - </dependency> </dependencies> <configuration> <!-- begin: workaround for unexpected NullPointerException on Eclipse --> |