diff options
Diffstat (limited to 'framework/src/onos/pom.xml')
| -rw-r--r-- | framework/src/onos/pom.xml | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/framework/src/onos/pom.xml b/framework/src/onos/pom.xml index 78fbcf2d..4d49abaa 100644 --- a/framework/src/onos/pom.xml +++ b/framework/src/onos/pom.xml @@ -47,7 +47,6 @@ <module>protocols</module> <!-- FIXME move to protocols/ --> - <module>ovsdb</module> <module>bgp</module> <module>providers</module> @@ -145,12 +144,6 @@ </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>3.9.0.Final</version> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava-testlib</artifactId> <version>18.0</version> @@ -188,6 +181,12 @@ </dependency> <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.6</version> + </dependency> + + <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> <version>1.9.13</version> @@ -438,22 +437,26 @@ <artifactId>onos-bgpio</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.6</version> - </dependency> + <dependency> <groupId>org.onosproject</groupId> <artifactId>onos-bgp-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.onosproject</groupId> <artifactId>onos-app-bgp-api</artifactId> <version>${project.version}</version> </dependency> + + + <!-- Netty related; for now we require both 3.9 and 4 --> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <version>3.9.0.Final</version> + </dependency> + <dependency> <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> @@ -474,17 +477,20 @@ <artifactId>netty-handler</artifactId> <version>${netty4.version}</version> </dependency> + <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec</artifactId> <version>${netty4.version}</version> </dependency> + <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> <version>${netty4.version}</version> <classifier>${os.detected.classifier}</classifier> </dependency> + <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> @@ -681,7 +687,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.13</version> + <version>2.16</version> <dependencies> <dependency> <groupId>org.onosproject</groupId> @@ -724,7 +730,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.2</version> + <version>3.5</version> <configuration> <excludes> </excludes> @@ -747,7 +753,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.2.201409121644</version> + <version>0.7.5.201505241946</version> <executions> <execution> <id>default-prepare-agent</id> @@ -772,7 +778,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12.1</version> <configuration> <configLocation>onos/checkstyle.xml</configLocation> </configuration> @@ -781,7 +786,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.2</version> <configuration> <excludes> </excludes> |