commit 47e2fccbfa1f99ccdcbd0a5f1f81411e0df3069f
author Thomas Vachuska <tom@onlab.us> Mon Nov 23 11:51:24 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Nov 24 21:27:47 2015 +0000
tree 7757e688dfc7a34b213e43b854d82f69c133f330
parent 03d4253f20220e440f2ee6589ccadd1bc8db4b91

Cleaning top-level pom.xml

Change-Id: I1b5955f20a640285d94947cf6778c11ef8518c2e

pom.xml

diff --git a/pom.xml b/pom.xml
index 2797f35..8b1f01c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,12 +145,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 +182,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 +438,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 +478,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 +688,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 +731,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.5</version>
                 <configuration>
                     <excludes>
                     </excludes>
@@ -772,7 +779,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 +787,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.2</version>
                 <configuration>
                     <excludes>
                     </excludes>