홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jian Li
Committed by Gerrit Code Review
c0c36a4e 1 parent ca47cd7e

[ONOS-3703] pom.xml external dependencies and plugin version bump 

This commit bumps up all maven plugins and dependencies to their
latest version. With bumped version onos passes stc test.

Following plugins are not ready to be bumped up due to instability.
check-style 2.16 -> 2.17: compilation error
maven-compiler-plugin 2.5.1 -> 3.3: always perform recompilation

Following dependencies are not ready to be bumped up due to instability.
kryo 3.0.0 -> 3.0.3: unit test failure
slf4j 1.7.6 -> 1.7.13: fails in stc

Change-Id: Iffe8b0734c7088228ebeee1ef597f0df3dfcd63d
Inline Side-by-side
Showing 5 changed files with 70 additions and 46 deletions
...@@ -21,36 +21,36 @@ ...@@ -21,36 +21,36 @@
21 <feature name="onos-thirdparty-base" version="@FEATURE-VERSION" 21 <feature name="onos-thirdparty-base" version="@FEATURE-VERSION"
22 description="ONOS 3rd party dependencies"> 22 description="ONOS 3rd party dependencies">
23 <bundle>mvn:commons-lang/commons-lang/2.6</bundle> 23 <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
24 - <bundle>mvn:org.apache.commons/commons-lang3/3.3.2</bundle> 24 + <bundle>mvn:org.apache.commons/commons-lang3/3.4</bundle>
25 <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle> 25 <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
26 - <bundle>mvn:com.google.guava/guava/18.0</bundle> 26 + <bundle>mvn:com.google.guava/guava/19.0</bundle>
27 - <bundle>mvn:io.netty/netty/3.9.2.Final</bundle> 27 + <bundle>mvn:io.netty/netty/3.10.5.Final</bundle>
28 - <bundle>mvn:io.netty/netty-common/4.0.23.Final</bundle> 28 + <bundle>mvn:io.netty/netty-common/4.0.33.Final</bundle>
29 - <bundle>mvn:io.netty/netty-buffer/4.0.23.Final</bundle> 29 + <bundle>mvn:io.netty/netty-buffer/4.0.33.Final</bundle>
30 - <bundle>mvn:io.netty/netty-transport/4.0.23.Final</bundle> 30 + <bundle>mvn:io.netty/netty-transport/4.0.33.Final</bundle>
31 - <bundle>mvn:io.netty/netty-handler/4.0.23.Final</bundle> 31 + <bundle>mvn:io.netty/netty-handler/4.0.33.Final</bundle>
32 - <bundle>mvn:io.netty/netty-codec/4.0.23.Final</bundle> 32 + <bundle>mvn:io.netty/netty-codec/4.0.33.Final</bundle>
33 - <bundle>mvn:io.netty/netty-transport-native-epoll/4.0.23.Final</bundle> 33 + <bundle>mvn:io.netty/netty-transport-native-epoll/4.0.33.Final</bundle>
34 <bundle>mvn:commons-pool/commons-pool/1.6</bundle> 34 <bundle>mvn:commons-pool/commons-pool/1.6</bundle>
35 <bundle>mvn:org.apache.commons/commons-math3/3.2</bundle> 35 <bundle>mvn:org.apache.commons/commons-math3/3.2</bundle>
36 36
37 - <bundle>mvn:joda-time/joda-time/2.5</bundle> 37 + <bundle>mvn:joda-time/joda-time/2.9</bundle>
38 38
39 <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle> 39 <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle>
40 <bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.0</bundle> 40 <bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.0</bundle>
41 <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle> 41 <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle>
42 42
43 <bundle>mvn:com.esotericsoftware/kryo/3.0.0</bundle> 43 <bundle>mvn:com.esotericsoftware/kryo/3.0.0</bundle>
44 - <bundle>mvn:com.esotericsoftware/reflectasm/1.10.0</bundle> 44 + <bundle>mvn:com.esotericsoftware/reflectasm/1.11.0</bundle>
45 <bundle>mvn:org.ow2.asm/asm/4.2</bundle> 45 <bundle>mvn:org.ow2.asm/asm/4.2</bundle>
46 <bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle> 46 <bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle>
47 <bundle>mvn:org.objenesis/objenesis/2.1</bundle> 47 <bundle>mvn:org.objenesis/objenesis/2.1</bundle>
48 48
49 <bundle>mvn:org.onosproject/onlab-nio/@ONOS-VERSION</bundle> 49 <bundle>mvn:org.onosproject/onlab-nio/@ONOS-VERSION</bundle>
50 50
51 - <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.2</bundle> 51 + <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.6.4</bundle>
52 - <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.2</bundle> 52 + <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.6.4</bundle>
53 - <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.2</bundle> 53 + <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.6.4</bundle>
54 54
55 <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle> 55 <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
56 <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle> 56 <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
......
...@@ -76,12 +76,17 @@ ...@@ -76,12 +76,17 @@
76 <properties> 76 <properties>
77 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 77 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
78 <onos-build-conf.version>1.1</onos-build-conf.version> 78 <onos-build-conf.version>1.1</onos-build-conf.version>
79 - <netty4.version>4.0.23.Final</netty4.version> 79 + <netty4.version>4.0.33.Final</netty4.version>
80 <copycat.version>0.5.1.onos</copycat.version> 80 <copycat.version>0.5.1.onos</copycat.version>
81 <openflowj.version>0.9.1.onos</openflowj.version> 81 <openflowj.version>0.9.1.onos</openflowj.version>
82 <onos-maven-plugin.version>1.8-SNAPSHOT</onos-maven-plugin.version> 82 <onos-maven-plugin.version>1.8-SNAPSHOT</onos-maven-plugin.version>
83 + <osgi.version>4.3.1</osgi.version>
83 <karaf.version>3.0.3</karaf.version> 84 <karaf.version>3.0.3</karaf.version>
84 <jersey.version>1.19</jersey.version> 85 <jersey.version>1.19</jersey.version>
86 + <fasterxml.jackson.version>2.6.4</fasterxml.jackson.version>
87 + <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
88 + <slf4j.version>1.7.6</slf4j.version>
89 + <guava.version>19.0</guava.version>
85 <!-- TODO argLine was originally added maven-surfire-plugin configuration 90 <!-- TODO argLine was originally added maven-surfire-plugin configuration
86 to fix locale errors for non-US developers. However, it breaks 91 to fix locale errors for non-US developers. However, it breaks
87 SonarQube's test coverage, so moving here for now. --> 92 SonarQube's test coverage, so moving here for now. -->
...@@ -100,7 +105,7 @@ ...@@ -100,7 +105,7 @@
100 <dependency> 105 <dependency>
101 <groupId>junit</groupId> 106 <groupId>junit</groupId>
102 <artifactId>junit</artifactId> 107 <artifactId>junit</artifactId>
103 - <version>4.11</version> 108 + <version>4.12</version>
104 <scope>test</scope> 109 <scope>test</scope>
105 </dependency> 110 </dependency>
106 111
...@@ -120,34 +125,34 @@ ...@@ -120,34 +125,34 @@
120 <dependency> 125 <dependency>
121 <groupId>org.slf4j</groupId> 126 <groupId>org.slf4j</groupId>
122 <artifactId>slf4j-api</artifactId> 127 <artifactId>slf4j-api</artifactId>
123 - <version>1.7.6</version> 128 + <version>${slf4j.version}</version>
124 <scope>provided</scope> 129 <scope>provided</scope>
125 </dependency> 130 </dependency>
126 131
127 <dependency> 132 <dependency>
128 <groupId>org.slf4j</groupId> 133 <groupId>org.slf4j</groupId>
129 <artifactId>slf4j-core</artifactId> 134 <artifactId>slf4j-core</artifactId>
130 - <version>1.7.6</version> 135 + <version>${slf4j.version}</version>
131 <scope>test</scope> 136 <scope>test</scope>
132 </dependency> 137 </dependency>
133 138
134 <dependency> 139 <dependency>
135 <groupId>org.slf4j</groupId> 140 <groupId>org.slf4j</groupId>
136 <artifactId>slf4j-jdk14</artifactId> 141 <artifactId>slf4j-jdk14</artifactId>
137 - <version>1.7.6</version> 142 + <version>${slf4j.version}</version>
138 <scope>test</scope> 143 <scope>test</scope>
139 </dependency> 144 </dependency>
140 145
141 <dependency> 146 <dependency>
142 <groupId>com.google.guava</groupId> 147 <groupId>com.google.guava</groupId>
143 <artifactId>guava</artifactId> 148 <artifactId>guava</artifactId>
144 - <version>18.0</version> 149 + <version>${guava.version}</version>
145 </dependency> 150 </dependency>
146 151
147 <dependency> 152 <dependency>
148 <groupId>com.google.guava</groupId> 153 <groupId>com.google.guava</groupId>
149 <artifactId>guava-testlib</artifactId> 154 <artifactId>guava-testlib</artifactId>
150 - <version>18.0</version> 155 + <version>${guava.version}</version>
151 <scope>test</scope> 156 <scope>test</scope>
152 </dependency> 157 </dependency>
153 158
...@@ -166,7 +171,7 @@ ...@@ -166,7 +171,7 @@
166 <dependency> 171 <dependency>
167 <groupId>org.apache.commons</groupId> 172 <groupId>org.apache.commons</groupId>
168 <artifactId>commons-lang3</artifactId> 173 <artifactId>commons-lang3</artifactId>
169 - <version>3.3.2</version> 174 + <version>3.4</version>
170 </dependency> 175 </dependency>
171 176
172 <dependency> 177 <dependency>
...@@ -178,7 +183,7 @@ ...@@ -178,7 +183,7 @@
178 <dependency> 183 <dependency>
179 <groupId>commons-collections</groupId> 184 <groupId>commons-collections</groupId>
180 <artifactId>commons-collections</artifactId> 185 <artifactId>commons-collections</artifactId>
181 - <version>3.2.1</version> 186 + <version>3.2.2</version>
182 </dependency> 187 </dependency>
183 188
184 <dependency> 189 <dependency>
...@@ -190,18 +195,18 @@ ...@@ -190,18 +195,18 @@
190 <dependency> 195 <dependency>
191 <groupId>org.codehaus.jackson</groupId> 196 <groupId>org.codehaus.jackson</groupId>
192 <artifactId>jackson-core-asl</artifactId> 197 <artifactId>jackson-core-asl</artifactId>
193 - <version>1.9.13</version> 198 + <version>${codehaus.jackson.version}</version>
194 </dependency> 199 </dependency>
195 <dependency> 200 <dependency>
196 <groupId>org.codehaus.jackson</groupId> 201 <groupId>org.codehaus.jackson</groupId>
197 <artifactId>jackson-mapper-asl</artifactId> 202 <artifactId>jackson-mapper-asl</artifactId>
198 - <version>1.9.13</version> 203 + <version>${codehaus.jackson.version}</version>
199 </dependency> 204 </dependency>
200 205
201 <dependency> 206 <dependency>
202 <groupId>org.easymock</groupId> 207 <groupId>org.easymock</groupId>
203 <artifactId>easymock</artifactId> 208 <artifactId>easymock</artifactId>
204 - <version>3.2</version> 209 + <version>3.4</version>
205 <scope>test</scope> 210 <scope>test</scope>
206 </dependency> 211 </dependency>
207 212
...@@ -233,13 +238,13 @@ ...@@ -233,13 +238,13 @@
233 <dependency> 238 <dependency>
234 <groupId>com.fasterxml.jackson.core</groupId> 239 <groupId>com.fasterxml.jackson.core</groupId>
235 <artifactId>jackson-databind</artifactId> 240 <artifactId>jackson-databind</artifactId>
236 - <version>2.4.2</version> 241 + <version>${fasterxml.jackson.version}</version>
237 <scope>provided</scope> 242 <scope>provided</scope>
238 </dependency> 243 </dependency>
239 <dependency> 244 <dependency>
240 <groupId>com.fasterxml.jackson.core</groupId> 245 <groupId>com.fasterxml.jackson.core</groupId>
241 <artifactId>jackson-annotations</artifactId> 246 <artifactId>jackson-annotations</artifactId>
242 - <version>2.4.2</version> 247 + <version>${fasterxml.jackson.version}</version>
243 <scope>provided</scope> 248 <scope>provided</scope>
244 </dependency> 249 </dependency>
245 250
...@@ -247,19 +252,19 @@ ...@@ -247,19 +252,19 @@
247 <dependency> 252 <dependency>
248 <groupId>org.osgi</groupId> 253 <groupId>org.osgi</groupId>
249 <artifactId>org.osgi.core</artifactId> 254 <artifactId>org.osgi.core</artifactId>
250 - <version>4.3.1</version> 255 + <version>${osgi.version}</version>
251 <scope>provided</scope> 256 <scope>provided</scope>
252 </dependency> 257 </dependency>
253 <dependency> 258 <dependency>
254 <groupId>org.osgi</groupId> 259 <groupId>org.osgi</groupId>
255 <artifactId>org.osgi.compendium</artifactId> 260 <artifactId>org.osgi.compendium</artifactId>
256 - <version>4.3.1</version> 261 + <version>${osgi.version}</version>
257 <scope>provided</scope> 262 <scope>provided</scope>
258 </dependency> 263 </dependency>
259 <dependency> 264 <dependency>
260 <groupId>org.apache.felix</groupId> 265 <groupId>org.apache.felix</groupId>
261 <artifactId>org.apache.felix.scr.annotations</artifactId> 266 <artifactId>org.apache.felix.scr.annotations</artifactId>
262 - <version>1.9.8</version> 267 + <version>1.9.12</version>
263 <scope>provided</scope> 268 <scope>provided</scope>
264 </dependency> 269 </dependency>
265 270
...@@ -291,7 +296,7 @@ ...@@ -291,7 +296,7 @@
291 <dependency> 296 <dependency>
292 <groupId>com.eclipsesource.minimal-json</groupId> 297 <groupId>com.eclipsesource.minimal-json</groupId>
293 <artifactId>minimal-json</artifactId> 298 <artifactId>minimal-json</artifactId>
294 - <version>0.9.1</version> 299 + <version>0.9.4</version>
295 </dependency> 300 </dependency>
296 <dependency> 301 <dependency>
297 <groupId>com.esotericsoftware</groupId> 302 <groupId>com.esotericsoftware</groupId>
...@@ -301,7 +306,7 @@ ...@@ -301,7 +306,7 @@
301 <dependency> 306 <dependency>
302 <groupId>com.esotericsoftware</groupId> 307 <groupId>com.esotericsoftware</groupId>
303 <artifactId>reflectasm</artifactId> 308 <artifactId>reflectasm</artifactId>
304 - <version>1.10.0</version> 309 + <version>1.11.0</version>
305 <type>bundle</type> 310 <type>bundle</type>
306 </dependency> 311 </dependency>
307 <dependency> 312 <dependency>
...@@ -317,7 +322,7 @@ ...@@ -317,7 +322,7 @@
317 <dependency> 322 <dependency>
318 <groupId>org.objenesis</groupId> 323 <groupId>org.objenesis</groupId>
319 <artifactId>objenesis</artifactId> 324 <artifactId>objenesis</artifactId>
320 - <version>2.1</version> 325 + <version>2.2</version>
321 </dependency> 326 </dependency>
322 327
323 <!-- ONOS related --> 328 <!-- ONOS related -->
...@@ -455,7 +460,7 @@ ...@@ -455,7 +460,7 @@
455 <dependency> 460 <dependency>
456 <groupId>io.netty</groupId> 461 <groupId>io.netty</groupId>
457 <artifactId>netty</artifactId> 462 <artifactId>netty</artifactId>
458 - <version>3.9.0.Final</version> 463 + <version>3.10.5.Final</version>
459 </dependency> 464 </dependency>
460 465
461 <dependency> 466 <dependency>
...@@ -495,13 +500,13 @@ ...@@ -495,13 +500,13 @@
495 <dependency> 500 <dependency>
496 <groupId>joda-time</groupId> 501 <groupId>joda-time</groupId>
497 <artifactId>joda-time</artifactId> 502 <artifactId>joda-time</artifactId>
498 - <version>2.5</version> 503 + <version>2.9</version>
499 </dependency> 504 </dependency>
500 505
501 <dependency> 506 <dependency>
502 <groupId>com.google.code.findbugs</groupId> 507 <groupId>com.google.code.findbugs</groupId>
503 <artifactId>jsr305</artifactId> 508 <artifactId>jsr305</artifactId>
504 - <version>3.0.0</version> 509 + <version>3.0.1</version>
505 </dependency> 510 </dependency>
506 </dependencies> 511 </dependencies>
507 </dependencyManagement> 512 </dependencyManagement>
...@@ -534,7 +539,7 @@ ...@@ -534,7 +539,7 @@
534 <dependency> 539 <dependency>
535 <groupId>com.google.code.findbugs</groupId> 540 <groupId>com.google.code.findbugs</groupId>
536 <artifactId>jsr305</artifactId> 541 <artifactId>jsr305</artifactId>
537 - <version>3.0.0</version> 542 + <version>3.0.1</version>
538 </dependency> 543 </dependency>
539 </dependencies> 544 </dependencies>
540 545
...@@ -556,8 +561,7 @@ ...@@ -556,8 +561,7 @@
556 <plugin> 561 <plugin>
557 <groupId>org.apache.maven.plugins</groupId> 562 <groupId>org.apache.maven.plugins</groupId>
558 <artifactId>maven-surefire-plugin</artifactId> 563 <artifactId>maven-surefire-plugin</artifactId>
559 - <!-- TODO newer version available --> 564 + <version>2.19.1</version>
560 - <version>2.18.1</version>
561 <configuration> 565 <configuration>
562 <redirectTestOutputToFile>true</redirectTestOutputToFile> 566 <redirectTestOutputToFile>true</redirectTestOutputToFile>
563 <printSummary>true</printSummary> 567 <printSummary>true</printSummary>
...@@ -600,7 +604,7 @@ ...@@ -600,7 +604,7 @@
600 <plugin> 604 <plugin>
601 <groupId>org.apache.maven.plugins</groupId> 605 <groupId>org.apache.maven.plugins</groupId>
602 <artifactId>maven-resources-plugin</artifactId> 606 <artifactId>maven-resources-plugin</artifactId>
603 - <version>2.6</version> 607 + <version>2.7</version>
604 </plugin> 608 </plugin>
605 609
606 <plugin> 610 <plugin>
...@@ -619,7 +623,7 @@ ...@@ -619,7 +623,7 @@
619 <plugin> 623 <plugin>
620 <groupId>org.apache.felix</groupId> 624 <groupId>org.apache.felix</groupId>
621 <artifactId>maven-scr-plugin</artifactId> 625 <artifactId>maven-scr-plugin</artifactId>
622 - <version>1.20.0</version> 626 + <version>1.21.0</version>
623 <executions> 627 <executions>
624 <execution> 628 <execution>
625 <id>generate-scr-srcdescriptor</id> 629 <id>generate-scr-srcdescriptor</id>
...@@ -731,7 +735,7 @@ ...@@ -731,7 +735,7 @@
731 <plugin> 735 <plugin>
732 <groupId>org.apache.maven.plugins</groupId> 736 <groupId>org.apache.maven.plugins</groupId>
733 <artifactId>maven-pmd-plugin</artifactId> 737 <artifactId>maven-pmd-plugin</artifactId>
734 - <version>3.5</version> 738 + <version>3.6</version>
735 <configuration> 739 <configuration>
736 <excludes> 740 <excludes>
737 </excludes> 741 </excludes>
...@@ -797,4 +801,4 @@ ...@@ -797,4 +801,4 @@
797 </plugin> 801 </plugin>
798 </plugins> 802 </plugins>
799 </reporting> 803 </reporting>
800 -</project> 804 +</project>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -143,6 +143,16 @@ public class ChannelAdapter implements Channel { ...@@ -143,6 +143,16 @@ public class ChannelAdapter implements Channel {
143 } 143 }
144 144
145 @Override 145 @Override
146 + public boolean getUserDefinedWritability(int i) {
147 + return false;
148 + }
149 +
150 + @Override
151 + public void setUserDefinedWritability(int i, boolean b) {
152 +
153 + }
154 +
155 + @Override
146 public Object getAttachment() { 156 public Object getAttachment() {
147 return null; 157 return null;
148 } 158 }
......
...@@ -143,6 +143,16 @@ public class ChannelAdapter implements Channel { ...@@ -143,6 +143,16 @@ public class ChannelAdapter implements Channel {
143 } 143 }
144 144
145 @Override 145 @Override
146 + public boolean getUserDefinedWritability(int i) {
147 + return false;
148 + }
149 +
150 + @Override
151 + public void setUserDefinedWritability(int i, boolean b) {
152 +
153 + }
154 +
155 + @Override
146 public Object getAttachment() { 156 public Object getAttachment() {
147 return null; 157 return null;
148 } 158 }
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 <extension> 48 <extension>
49 <groupId>org.apache.maven.archetype</groupId> 49 <groupId>org.apache.maven.archetype</groupId>
50 <artifactId>archetype-packaging</artifactId> 50 <artifactId>archetype-packaging</artifactId>
51 - <version>2.2</version> 51 + <version>2.4</version>
52 </extension> 52 </extension>
53 </extensions> 53 </extensions>
54 54
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <plugins> 56 <plugins>
57 <plugin> 57 <plugin>
58 <artifactId>maven-archetype-plugin</artifactId> 58 <artifactId>maven-archetype-plugin</artifactId>
59 - <version>2.2</version> 59 + <version>2.4</version>
60 </plugin> 60 </plugin>
61 </plugins> 61 </plugins>
62 </pluginManagement> 62 </pluginManagement>
......