홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
5d42c6b1 1 parent 6bc5594e

Fixed javadoc groups.

Inline Side-by-side
Showing 1 changed file with 71 additions and 69 deletions
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
89 </dependency> 89 </dependency>
90 90
91 91
92 - <dependency> 92 + <dependency>
93 <groupId>io.netty</groupId> 93 <groupId>io.netty</groupId>
94 <artifactId>netty</artifactId> 94 <artifactId>netty</artifactId>
95 <version>3.9.0.Final</version> 95 <version>3.9.0.Final</version>
...@@ -103,13 +103,13 @@ ...@@ -103,13 +103,13 @@
103 </dependency> 103 </dependency>
104 104
105 <dependency> 105 <dependency>
106 - <groupId>com.googlecode.concurrent-trees</groupId> 106 + <groupId>com.googlecode.concurrent-trees</groupId>
107 - <artifactId>concurrent-trees</artifactId> 107 + <artifactId>concurrent-trees</artifactId>
108 - <version>2.4.0</version> 108 + <version>2.4.0</version>
109 </dependency> 109 </dependency>
110 110
111 <dependency> 111 <dependency>
112 - <groupId>commons-lang</groupId> 112 + <groupId>commons-lang</groupId>
113 <artifactId>commons-lang</artifactId> 113 <artifactId>commons-lang</artifactId>
114 <version>2.6</version> 114 <version>2.6</version>
115 </dependency> 115 </dependency>
...@@ -131,12 +131,12 @@ ...@@ -131,12 +131,12 @@
131 <version>1.9.13</version> 131 <version>1.9.13</version>
132 </dependency> 132 </dependency>
133 133
134 - <dependency> 134 + <dependency>
135 - <groupId>org.easymock</groupId> 135 + <groupId>org.easymock</groupId>
136 - <artifactId>easymock</artifactId> 136 + <artifactId>easymock</artifactId>
137 - <version>3.2</version> 137 + <version>3.2</version>
138 - <scope>test</scope> 138 + <scope>test</scope>
139 - </dependency> 139 + </dependency>
140 140
141 <!-- Web related --> 141 <!-- Web related -->
142 <dependency> 142 <dependency>
...@@ -191,9 +191,9 @@ ...@@ -191,9 +191,9 @@
191 </dependency> 191 </dependency>
192 192
193 <dependency> 193 <dependency>
194 - <groupId>com.hazelcast</groupId> 194 + <groupId>com.hazelcast</groupId>
195 - <artifactId>hazelcast</artifactId> 195 + <artifactId>hazelcast</artifactId>
196 - <version>3.3</version> 196 + <version>3.3</version>
197 </dependency> 197 </dependency>
198 <dependency> 198 <dependency>
199 <groupId>com.eclipsesource.minimal-json</groupId> 199 <groupId>com.eclipsesource.minimal-json</groupId>
...@@ -270,9 +270,9 @@ ...@@ -270,9 +270,9 @@
270 </dependency> 270 </dependency>
271 271
272 <dependency> 272 <dependency>
273 - <groupId>org.onlab.onos</groupId> 273 + <groupId>org.onlab.onos</groupId>
274 - <artifactId>onlab-thirdparty</artifactId> 274 + <artifactId>onlab-thirdparty</artifactId>
275 - <version>${project.version}</version> 275 + <version>${project.version}</version>
276 </dependency> 276 </dependency>
277 277
278 <dependency> 278 <dependency>
...@@ -283,39 +283,39 @@ ...@@ -283,39 +283,39 @@
283 <scope>test</scope> 283 <scope>test</scope>
284 </dependency> 284 </dependency>
285 <dependency> 285 <dependency>
286 - <groupId>commons-pool</groupId> 286 + <groupId>commons-pool</groupId>
287 - <artifactId>commons-pool</artifactId> 287 + <artifactId>commons-pool</artifactId>
288 - <version>1.6</version> 288 + <version>1.6</version>
289 </dependency> 289 </dependency>
290 <dependency> 290 <dependency>
291 - <groupId>io.netty</groupId> 291 + <groupId>io.netty</groupId>
292 - <artifactId>netty-common</artifactId> 292 + <artifactId>netty-common</artifactId>
293 - <version>${netty4.version}</version> 293 + <version>${netty4.version}</version>
294 </dependency> 294 </dependency>
295 <dependency> 295 <dependency>
296 - <groupId>io.netty</groupId> 296 + <groupId>io.netty</groupId>
297 - <artifactId>netty-buffer</artifactId> 297 + <artifactId>netty-buffer</artifactId>
298 - <version>${netty4.version}</version> 298 + <version>${netty4.version}</version>
299 </dependency> 299 </dependency>
300 <dependency> 300 <dependency>
301 - <groupId>io.netty</groupId> 301 + <groupId>io.netty</groupId>
302 - <artifactId>netty-transport</artifactId> 302 + <artifactId>netty-transport</artifactId>
303 - <version>${netty4.version}</version> 303 + <version>${netty4.version}</version>
304 </dependency> 304 </dependency>
305 <dependency> 305 <dependency>
306 - <groupId>io.netty</groupId> 306 + <groupId>io.netty</groupId>
307 - <artifactId>netty-handler</artifactId> 307 + <artifactId>netty-handler</artifactId>
308 - <version>${netty4.version}</version> 308 + <version>${netty4.version}</version>
309 </dependency> 309 </dependency>
310 <dependency> 310 <dependency>
311 - <groupId>io.netty</groupId> 311 + <groupId>io.netty</groupId>
312 - <artifactId>netty-codec</artifactId> 312 + <artifactId>netty-codec</artifactId>
313 - <version>${netty4.version}</version> 313 + <version>${netty4.version}</version>
314 </dependency> 314 </dependency>
315 <dependency> 315 <dependency>
316 - <groupId>io.netty</groupId> 316 + <groupId>io.netty</groupId>
317 - <artifactId>netty-transport-native-epoll</artifactId> 317 + <artifactId>netty-transport-native-epoll</artifactId>
318 - <version>${netty4.version}</version> 318 + <version>${netty4.version}</version>
319 </dependency> 319 </dependency>
320 </dependencies> 320 </dependencies>
321 </dependencyManagement> 321 </dependencyManagement>
...@@ -363,7 +363,8 @@ ...@@ -363,7 +363,8 @@
363 <artifactId>maven-surefire-plugin</artifactId> 363 <artifactId>maven-surefire-plugin</artifactId>
364 <version>2.17</version> 364 <version>2.17</version>
365 <configuration> 365 <configuration>
366 - <redirectTestOutputToFile>true</redirectTestOutputToFile> 366 + <redirectTestOutputToFile>true
367 + </redirectTestOutputToFile>
367 <printSummary>true</printSummary> 368 <printSummary>true</printSummary>
368 </configuration> 369 </configuration>
369 </plugin> 370 </plugin>
...@@ -418,32 +419,32 @@ ...@@ -418,32 +419,32 @@
418 <!-- TODO: add findbugs plugin for static code analysis; for explicit invocation only --> 419 <!-- TODO: add findbugs plugin for static code analysis; for explicit invocation only -->
419 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> 420 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
420 <plugin> 421 <plugin>
421 - <groupId>org.eclipse.m2e</groupId> 422 + <groupId>org.eclipse.m2e</groupId>
422 - <artifactId>lifecycle-mapping</artifactId> 423 + <artifactId>lifecycle-mapping</artifactId>
423 - <version>1.0.0</version> 424 + <version>1.0.0</version>
424 - <configuration> 425 + <configuration>
425 - <lifecycleMappingMetadata> 426 + <lifecycleMappingMetadata>
426 - <pluginExecutions> 427 + <pluginExecutions>
427 - <pluginExecution> 428 + <pluginExecution>
428 - <pluginExecutionFilter> 429 + <pluginExecutionFilter>
429 - <groupId>org.jacoco</groupId> 430 + <groupId>org.jacoco</groupId>
430 - <artifactId> 431 + <artifactId>
431 - jacoco-maven-plugin 432 + jacoco-maven-plugin
432 - </artifactId> 433 + </artifactId>
433 - <versionRange> 434 + <versionRange>
434 - [0.7.1.201405082137,) 435 + [0.7.1.201405082137,)
435 - </versionRange> 436 + </versionRange>
436 - <goals> 437 + <goals>
437 - <goal>prepare-agent</goal> 438 + <goal>prepare-agent</goal>
438 - </goals> 439 + </goals>
439 - </pluginExecutionFilter> 440 + </pluginExecutionFilter>
440 - <action> 441 + <action>
441 - <ignore></ignore> 442 + <ignore></ignore>
442 - </action> 443 + </action>
443 - </pluginExecution> 444 + </pluginExecution>
444 - </pluginExecutions> 445 + </pluginExecutions>
445 - </lifecycleMappingMetadata> 446 + </lifecycleMappingMetadata>
446 - </configuration> 447 + </configuration>
447 </plugin> 448 </plugin>
448 </plugins> 449 </plugins>
449 </pluginManagement> 450 </pluginManagement>
...@@ -532,7 +533,7 @@ ...@@ -532,7 +533,7 @@
532 <plugin> 533 <plugin>
533 <groupId>org.apache.maven.plugins</groupId> 534 <groupId>org.apache.maven.plugins</groupId>
534 <artifactId>maven-javadoc-plugin</artifactId> 535 <artifactId>maven-javadoc-plugin</artifactId>
535 - <version>2.9.1</version> 536 + <version>2.10.1</version>
536 <configuration> 537 <configuration>
537 <show>package</show> 538 <show>package</show>
538 <docfilessubdirs>true</docfilessubdirs> 539 <docfilessubdirs>true</docfilessubdirs>
...@@ -547,7 +548,7 @@ ...@@ -547,7 +548,7 @@
547 <group> 548 <group>
548 <title>Core Subsystems</title> 549 <title>Core Subsystems</title>
549 <packages> 550 <packages>
550 - org.onlab.onos.impl:org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.store.trivial.*:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.store.*:org.onlab.onos.net.intent.impl:org.onlab.onos.net.proxyarp.impl:org.onlab.onos.mastership.impl:org.onlab.onos.json:org.onlab.onos.json.* 551 + org.onlab.onos.impl:org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.store.trivial.*:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.store.*:org.onlab.onos.net.intent.impl:org.onlab.onos.net.proxyarp.impl:org.onlab.onos.mastership.impl:org.onlab.onos.json:org.onlab.onos.json.*:org.onlab.onos.provider.host.impl:org.onlab.onos.provider.lldp.impl:org.onlab.onos.net.statistic.impl
551 </packages> 552 </packages>
552 </group> 553 </group>
553 <group> 554 <group>
...@@ -572,11 +573,12 @@ ...@@ -572,11 +573,12 @@
572 <group> 573 <group>
573 <title>Sample Applications</title> 574 <title>Sample Applications</title>
574 <packages> 575 <packages>
575 - org.onlab.onos.tvue:org.onlab.onos.fwd:org.onlab.onos.ifwd:org.onlab.onos.mobility:org.onlab.onos.proxyarp:org.onlab.onos.foo:org.onlab.onos.calendar:org.onlab.onos.sdnip:org.onlab.onos.sdnip.*:org.onlab.onos.optical:org.onlab.onos.optical.* 576 + org.onlab.onos.tvue:org.onlab.onos.fwd:org.onlab.onos.ifwd:org.onlab.onos.mobility:org.onlab.onos.proxyarp:org.onlab.onos.foo:org.onlab.onos.calendar:org.onlab.onos.sdnip:org.onlab.onos.sdnip.*:org.onlab.onos.optical:org.onlab.onos.optical.*:org.onlab.onos.metrics.*
576 </packages> 577 </packages>
577 </group> 578 </group>
578 </groups> 579 </groups>
579 - <excludePackageNames>org.onlab.thirdparty</excludePackageNames> 580 + <excludePackageNames>org.onlab.thirdparty
581 + </excludePackageNames>
580 </configuration> 582 </configuration>
581 </plugin> 583 </plugin>
582 584
......