홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
47e2fccb 1 parent 03d4253f

Cleaning top-level pom.xml 

Change-Id: I1b5955f20a640285d94947cf6778c11ef8518c2e
Inline Side-by-side
Showing 1 changed file with 21 additions and 16 deletions
...@@ -145,12 +145,6 @@ ...@@ -145,12 +145,6 @@
145 </dependency> 145 </dependency>
146 146
147 <dependency> 147 <dependency>
148 - <groupId>io.netty</groupId>
149 - <artifactId>netty</artifactId>
150 - <version>3.9.0.Final</version>
151 - </dependency>
152 -
153 - <dependency>
154 <groupId>com.google.guava</groupId> 148 <groupId>com.google.guava</groupId>
155 <artifactId>guava-testlib</artifactId> 149 <artifactId>guava-testlib</artifactId>
156 <version>18.0</version> 150 <version>18.0</version>
...@@ -188,6 +182,12 @@ ...@@ -188,6 +182,12 @@
188 </dependency> 182 </dependency>
189 183
190 <dependency> 184 <dependency>
185 + <groupId>commons-pool</groupId>
186 + <artifactId>commons-pool</artifactId>
187 + <version>1.6</version>
188 + </dependency>
189 +
190 + <dependency>
191 <groupId>org.codehaus.jackson</groupId> 191 <groupId>org.codehaus.jackson</groupId>
192 <artifactId>jackson-core-asl</artifactId> 192 <artifactId>jackson-core-asl</artifactId>
193 <version>1.9.13</version> 193 <version>1.9.13</version>
...@@ -438,22 +438,26 @@ ...@@ -438,22 +438,26 @@
438 <artifactId>onos-bgpio</artifactId> 438 <artifactId>onos-bgpio</artifactId>
439 <version>${project.version}</version> 439 <version>${project.version}</version>
440 </dependency> 440 </dependency>
441 - <dependency> 441 +
442 - <groupId>commons-pool</groupId>
443 - <artifactId>commons-pool</artifactId>
444 - <version>1.6</version>
445 - </dependency>
446 <dependency> 442 <dependency>
447 <groupId>org.onosproject</groupId> 443 <groupId>org.onosproject</groupId>
448 <artifactId>onos-bgp-api</artifactId> 444 <artifactId>onos-bgp-api</artifactId>
449 <version>${project.version}</version> 445 <version>${project.version}</version>
450 </dependency> 446 </dependency>
451 -
452 <dependency> 447 <dependency>
453 <groupId>org.onosproject</groupId> 448 <groupId>org.onosproject</groupId>
454 <artifactId>onos-app-bgp-api</artifactId> 449 <artifactId>onos-app-bgp-api</artifactId>
455 <version>${project.version}</version> 450 <version>${project.version}</version>
456 </dependency> 451 </dependency>
452 +
453 +
454 + <!-- Netty related; for now we require both 3.9 and 4 -->
455 + <dependency>
456 + <groupId>io.netty</groupId>
457 + <artifactId>netty</artifactId>
458 + <version>3.9.0.Final</version>
459 + </dependency>
460 +
457 <dependency> 461 <dependency>
458 <groupId>io.netty</groupId> 462 <groupId>io.netty</groupId>
459 <artifactId>netty-common</artifactId> 463 <artifactId>netty-common</artifactId>
...@@ -474,17 +478,20 @@ ...@@ -474,17 +478,20 @@
474 <artifactId>netty-handler</artifactId> 478 <artifactId>netty-handler</artifactId>
475 <version>${netty4.version}</version> 479 <version>${netty4.version}</version>
476 </dependency> 480 </dependency>
481 +
477 <dependency> 482 <dependency>
478 <groupId>io.netty</groupId> 483 <groupId>io.netty</groupId>
479 <artifactId>netty-codec</artifactId> 484 <artifactId>netty-codec</artifactId>
480 <version>${netty4.version}</version> 485 <version>${netty4.version}</version>
481 </dependency> 486 </dependency>
487 +
482 <dependency> 488 <dependency>
483 <groupId>io.netty</groupId> 489 <groupId>io.netty</groupId>
484 <artifactId>netty-transport-native-epoll</artifactId> 490 <artifactId>netty-transport-native-epoll</artifactId>
485 <version>${netty4.version}</version> 491 <version>${netty4.version}</version>
486 <classifier>${os.detected.classifier}</classifier> 492 <classifier>${os.detected.classifier}</classifier>
487 </dependency> 493 </dependency>
494 +
488 <dependency> 495 <dependency>
489 <groupId>joda-time</groupId> 496 <groupId>joda-time</groupId>
490 <artifactId>joda-time</artifactId> 497 <artifactId>joda-time</artifactId>
...@@ -681,7 +688,7 @@ ...@@ -681,7 +688,7 @@
681 <plugin> 688 <plugin>
682 <groupId>org.apache.maven.plugins</groupId> 689 <groupId>org.apache.maven.plugins</groupId>
683 <artifactId>maven-checkstyle-plugin</artifactId> 690 <artifactId>maven-checkstyle-plugin</artifactId>
684 - <version>2.13</version> 691 + <version>2.16</version>
685 <dependencies> 692 <dependencies>
686 <dependency> 693 <dependency>
687 <groupId>org.onosproject</groupId> 694 <groupId>org.onosproject</groupId>
...@@ -724,7 +731,7 @@ ...@@ -724,7 +731,7 @@
724 <plugin> 731 <plugin>
725 <groupId>org.apache.maven.plugins</groupId> 732 <groupId>org.apache.maven.plugins</groupId>
726 <artifactId>maven-pmd-plugin</artifactId> 733 <artifactId>maven-pmd-plugin</artifactId>
727 - <version>3.2</version> 734 + <version>3.5</version>
728 <configuration> 735 <configuration>
729 <excludes> 736 <excludes>
730 </excludes> 737 </excludes>
...@@ -772,7 +779,6 @@ ...@@ -772,7 +779,6 @@
772 <plugin> 779 <plugin>
773 <groupId>org.apache.maven.plugins</groupId> 780 <groupId>org.apache.maven.plugins</groupId>
774 <artifactId>maven-checkstyle-plugin</artifactId> 781 <artifactId>maven-checkstyle-plugin</artifactId>
775 - <version>2.12.1</version>
776 <configuration> 782 <configuration>
777 <configLocation>onos/checkstyle.xml</configLocation> 783 <configLocation>onos/checkstyle.xml</configLocation>
778 </configuration> 784 </configuration>
...@@ -781,7 +787,6 @@ ...@@ -781,7 +787,6 @@
781 <plugin> 787 <plugin>
782 <groupId>org.apache.maven.plugins</groupId> 788 <groupId>org.apache.maven.plugins</groupId>
783 <artifactId>maven-pmd-plugin</artifactId> 789 <artifactId>maven-pmd-plugin</artifactId>
784 - <version>3.2</version>
785 <configuration> 790 <configuration>
786 <excludes> 791 <excludes>
787 </excludes> 792 </excludes>
......