Fixed some Javadoc warnings and obsoleted the old package list files
that were left over from Maven and Buck builds.
Change-Id: I51c43efd9dacd18d283724c8af59c142f5540a94
diff --git a/core/api/src/main/java/org/onosproject/store/service/TransactionalSet.java b/core/api/src/main/java/org/onosproject/store/service/TransactionalSet.java
index 2836caf..9765fd7 100644
--- a/core/api/src/main/java/org/onosproject/store/service/TransactionalSet.java
+++ b/core/api/src/main/java/org/onosproject/store/service/TransactionalSet.java
@@ -29,43 +29,43 @@
/**
* Adds the specified element to this set if it is not already present
* (optional operation). More formally, adds the specified element
- * <tt>e</tt> to this set if the set contains no element <tt>e2</tt>
+ * <code>e</code> to this set if the set contains no element <code>e2</code>
* such that
- * <tt>(e==null ? e2==null : e.equals(e2))</tt>.
+ * <code>(e==null ? e2==null : e.equals(e2))</code>.
* If this set already contains the element, the call leaves the set
- * unchanged and returns <tt>false</tt>. In combination with the
+ * unchanged and returns <code>false</code>. In combination with the
* restriction on constructors, this ensures that sets never contain
* duplicate elements.
*
* @param e element to be added to this set
- * @return <tt>true</tt> if this set did not already contain the specified
+ * @return <code>true</code> if this set did not already contain the specified
* element
*/
boolean add(E e);
/**
* Removes the specified element from this set if it is present
- * (optional operation). More formally, removes an element <tt>e</tt>
+ * (optional operation). More formally, removes an element <code>e</code>
* such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>, if
- * this set contains such an element. Returns <tt>true</tt> if this set
+ * <code>(o==null ? e==null : o.equals(e))</code>, if
+ * this set contains such an element. Returns <code>true</code> if this set
* contained the element (or equivalently, if this set changed as a
* result of the call). (This set will not contain the element once the
* call returns.)
*
* @param e element to be removed to this set
- * @return <tt>true</tt> if this set contained the specified element
+ * @return <code>true</code> if this set contained the specified element
*/
boolean remove(E e);
/**
- * Returns <tt>true</tt> if this set contains the specified element.
- * More formally, returns <tt>true</tt> if and only if this set
- * contains an element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * Returns <code>true</code> if this set contains the specified element.
+ * More formally, returns <code>true</code> if and only if this set
+ * contains an element <code>e</code> such that
+ * <code>(o==null ? e==null : o.equals(e))</code>.
*
* @param e element whose presence in this set is to be tested
- * @return <tt>true</tt> if this set contains the specified element
+ * @return <code>true</code> if this set contains the specified element
* @throws ClassCastException if the type of the specified element
* is incompatible with this set
* @throws NullPointerException if the specified element is null and this
diff --git a/docs/BUILD b/docs/BUILD
index 39693ab..63adb0a 100644
--- a/docs/BUILD
+++ b/docs/BUILD
@@ -297,6 +297,9 @@
deps = JAVADOC_DEPS,
)
+# FIXME: This is broken because currently javax.bind stuff is not found
+# For some reason javadoc for a different toolchain is user.
+# We will fix this once we're fully on Java 11 (LTS)
project_javadoc(
name = "internal",
srcs = SOURCES + INTERNAL_SOURCES,
diff --git a/docs/external-apis b/docs/external-apis
deleted file mode 100644
index 4e18664..0000000
--- a/docs/external-apis
+++ /dev/null
@@ -1,3 +0,0 @@
-org.onosproject
-org.onosproject.*
-org.onosproject.rest
\ No newline at end of file
diff --git a/docs/external-apps b/docs/external-apps
deleted file mode 100644
index b2e4d89..0000000
--- a/docs/external-apps
+++ /dev/null
@@ -1,5 +0,0 @@
-org.onosproject.dhcp
-org.onosproject.cpman
-org.onosproject.olt
-org.onosproject.openstackswitching
-org.onosproject.routing
diff --git a/docs/external-excludes b/docs/external-excludes
deleted file mode 100644
index 8bd371a..0000000
--- a/docs/external-excludes
+++ /dev/null
@@ -1,101 +0,0 @@
-*.impl
-*.impl.*
-protobuf.*
-
-org.onlab.jdvue*
-org.onlab.stc*
-org.onlab.catalyst*
-
-org.onlab.atomix
-org.onosproject.provider*
-org.onosproject.rest
-org.onosproject.cli*
-org.onosproject.dhcp*
-org.onosproject.flowperf*
-org.onosproject.loadtest*
-org.onosproject.tvue
-org.onosproject.mlb
-org.onosproject.mobility
-org.onosproject.proxyarp
-org.onosproject.fwd
-org.onosproject.ifwd
-org.onosproject.optical
-org.onosproject.config
-org.onosproject.calendar
-org.onosproject.sdnip*
-org.onosproject.oecfg
-org.onosproject.metrics
-org.onosproject.store.ecmap
-org.onosproject.store.flow
-org.onosproject.store.serializers*
-org.onosproject.openflow*
-org.onosproject.common*
-org.onosproject.bgprouter
-org.onosproject.intentperf
-org.onosproject.maven
-org.onosproject.cordfabric*
-org.onosproject.driver*
-org.onosproject.segmentrouting*
-org.onosproject.reactive*
-org.onosproject.distributedprimitives*
-org.onosproject.messagingperf*
-org.onosproject.virtualbng*
-org.onosproject.election*
-org.onosproject.demo*
-org.onosproject.xosintegration*
-org.onosproject.app.vtn*
-org.onosproject.ovsdb*
-org.onosproject.bgp*
-org.onosproject.pcep*
-org.onosproject.aaa
-org.onosproject.acl*
-org.onosproject.olt.*
-org.onosproject.cpman.*
-org.onosproject.pathpainter*
-org.onosproject.openstackswitching.*
-org.onosproject.openstackrouting*
-org.onosproject.protocol*
-org.onosproject.sfc*
-org.onosproject.vrouter*
-org.onosproject.vpls*
-org.onosproject.netconf*
-org.onosproject.security.store*
-org.onosproject.faultmanagement*
-org.onosproject.iptopology*
-org.onosproject.igmp*
-org.onosproject.pim*
-org.onosproject.cip*
-org.onosproject.acl*
-org.onosproject.vtn*
-org.onosproject.cord*
-org.onosproject.events
-org.onosproject.mfwd*
-org.onosproject.mcast*
-org.onosproject.flowanalyzer
-org.onosproject.grpc*
-org.onosproject.isis*
-org.onosproject.lisp*
-org.onosproject.pce.*
-org.onosproject.pcerest*
-org.onosproject.pceweb*
-org.onosproject.snmp*
-org.onosproject.newoptical*
-org.onosproject.scalablegateway*
-org.onosproject.bmv2*
-org.onosproject.xosclient*
-org.onosproject.kafkaintegration*
-org.onosproject.gangliametrics*
-org.onosproject.graphitemetrics*
-org.onosproject.influxdbmetrics*
-org.onosproject.netcfgmonitor*
-org.onosproject.openstacknode*
-org.onosproject.openstackinterface*
-org.onosproject.openstacknetworking*
-org.onosproject.store.app
-org.onosproject.store.cfg
-org.onosproject.ospf*
-org.onosproject.ospf*
-org.onosproject.routing.*
-org.onosproject.yangutils.parser.antlrgencode
-org.onosproject.yangutils.*
-org.onosproject.yms*
diff --git a/docs/external-incubator-apis b/docs/external-incubator-apis
deleted file mode 100644
index 1e3bd7a..0000000
--- a/docs/external-incubator-apis
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.exp
-org.onosproject.incubator.*
diff --git a/docs/external.xml b/docs/external.xml
deleted file mode 100644
index d7dd4aa..0000000
--- a/docs/external.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright 2014-present Open Networking Foundation
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0.0</maven>
- </prerequisites>
-
- <parent>
- <groupId>org.onosproject</groupId>
- <artifactId>onos</artifactId>
- <version>1.15.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>onos-docs-external</artifactId>
- <packaging>pom</packaging>
-
- <description>ONOS Java API documentation</description>
-
- <modules>
- <module>..</module>
- </modules>
-
- <url>http://onosproject.org/</url>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <show>package</show>
- <sourceFileExcludes>
- <sourceFileExclude>**/generated-sources/**</sourceFileExclude>
- </sourceFileExcludes>
- <excludePackageNames>@external-excludes</excludePackageNames>
- <docfilessubdirs>true</docfilessubdirs>
- <doctitle>ONOS Java API (1.15.0-SNAPSHOT)</doctitle>
- <groups>
- <group>
- <title>Network Model & Services</title>
- <packages>@external-apis</packages>
- </group>
- <group>
- <title>Incubator for Network Model & Services
- </title>
- <packages>@external-incubator-apis</packages>
- </group>
- <group>
- <title>Utilities</title>
- <packages>@utils</packages>
- </group>
- <group>
- <title>App & Extensions</title>
- <packages>@external-apps</packages>
- </group>
- </groups>
- <tags>
- <tag>
- <name>onos.rsModel</name>
- <placement>m</placement>
- <head>Json model for REST api:</head>
- </tag>
- </tags>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/docs/internal-apis b/docs/internal-apis
deleted file mode 100644
index a35d093..0000000
--- a/docs/internal-apis
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject
-org.onosproject.*
diff --git a/docs/internal-apps b/docs/internal-apps
deleted file mode 100644
index 1f46702..0000000
--- a/docs/internal-apps
+++ /dev/null
@@ -1,55 +0,0 @@
-org.onosproject.app.*
-
-org.onosproject.acl*
-org.onosproject.aaa
-org.onosproject.fwd
-org.onosproject.dhcp*
-org.onosproject.flowanalyzer
-org.onosproject.cpman*
-org.onosproject.mobility
-org.onosproject.proxyarp
-org.onosproject.calendar
-org.onosproject.olt*
-org.onosproject.optical*
-org.onosproject.newoptical*
-org.onosproject.sdnip
-org.onosproject.sdnip.*
-org.onosproject.config
-org.onosproject.routing
-org.onosproject.routing*
-org.onosproject.bgprouter
-org.onosproject.segmentrouting*
-org.onosproject.reactive.routing*
-org.onosproject.messagingperf
-org.onosproject.virtualbng*
-org.onosproject.cordfabric*
-org.onosproject.xosintegration*
-org.onosproject.cip*
-org.onosproject.vtn*
-org.onosproject.cord*
-org.onosproject.mcast*
-org.onosproject.mfwd*
-org.onosproject.mlb*
-org.onosproject.igmp*
-org.onosproject.pim*
-org.onosproject.vpls*
-org.onosproject.vrouter*
-org.onosproject.faultmanagement*
-org.onosproject.iptopology*
-org.onosproject.drivermatrix*
-org.onosproject.pathpainter*
-org.onosproject.openstack*
-org.onosproject.scalablegateway*
-org.onosproject.forwarder*
-org.onosproject.sfc*
-org.onosproject.netcfgmonitor*
-org.onosproject.flowperf
-org.onosproject.loadtest
-org.onosproject.events
-org.onosproject.bmv2*
-org.onosproject.xosclient*
-org.onosproject.kafkaintegration*
-org.onosproject.gangliametrics*
-org.onosproject.graphitemetrics*
-org.onosproject.influxdbmetrics*
-org.onosproject.yms*
diff --git a/docs/internal-bgpls b/docs/internal-bgpls
deleted file mode 100644
index 25bf23c..0000000
--- a/docs/internal-bgpls
+++ /dev/null
@@ -1,3 +0,0 @@
-org.onosproject.bgp.controller*
-org.onosproject.bgp*
-org.onosproject.provider.bgp*
diff --git a/docs/internal-core b/docs/internal-core
deleted file mode 100644
index f987aa9..0000000
--- a/docs/internal-core
+++ /dev/null
@@ -1,28 +0,0 @@
-org.onosproject.cfg.impl
-org.onosproject.cluster.impl
-org.onosproject.core.impl
-org.onosproject.event.impl
-org.onosproject.net.config.impl
-org.onosproject.net.device.impl
-org.onosproject.net.driver.impl
-org.onosproject.net.edgeservice.impl
-org.onosproject.net.flow.impl
-org.onosproject.net.flowobjective.impl
-org.onosproject.net.flowobjective.impl.composition
-org.onosproject.net.group.impl
-org.onosproject.net.host.impl
-org.onosproject.net.intent.impl
-org.onosproject.net.intent.impl.compiler
-org.onosproject.net.intent.impl.phase
-org.onosproject.net.link.impl
-org.onosproject.net.newresource.impl
-org.onosproject.net.packet.impl
-org.onosproject.net.proxyarp.impl
-org.onosproject.net.resource.impl
-org.onosproject.net.statistic.impl
-org.onosproject.net.topology.impl
-org.onosproject.json
-org.onosproject.json.*
-org.onosproject.common.*
-org.onosproject.security.impl
-org.onosproject.security.store
diff --git a/docs/internal-drivers b/docs/internal-drivers
deleted file mode 100644
index 90cf08d..0000000
--- a/docs/internal-drivers
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.driver*
diff --git a/docs/internal-excludes b/docs/internal-excludes
deleted file mode 100644
index 7ac0a66..0000000
--- a/docs/internal-excludes
+++ /dev/null
@@ -1,9 +0,0 @@
-org.onlab.jdvue*
-org.onlab.stc*
-org.onlab.catalyst*
-org.onlab.atomix
-org.onosproject.oecfg
-org.onosproject.maven
-org.onosproject.grpc*
-org.onosproject.yangutils.*
-protobuf.*
diff --git a/docs/internal-gui-rest-cli b/docs/internal-gui-rest-cli
deleted file mode 100644
index 7b529c0..0000000
--- a/docs/internal-gui-rest-cli
+++ /dev/null
@@ -1,4 +0,0 @@
-org.onosproject.ui.impl*
-org.onosproject.rest.*
-org.onosproject.cli*
-org.onosproject.codec.impl
diff --git a/docs/internal-incubator b/docs/internal-incubator
deleted file mode 100644
index 1f677a5..0000000
--- a/docs/internal-incubator
+++ /dev/null
@@ -1,12 +0,0 @@
-org.onosproject.incubator.net.impl
-org.onosproject.incubator.store.impl
-org.onosproject.incubator.net.resource.label.impl
-org.onosproject.incubator.store.resource.impl
-org.onosproject.incubator.net.tunnel.impl
-org.onosproject.incubator.store.tunnel.impl
-org.onosproject.incubator.net.config.impl
-org.onosproject.incubator.net.domain.impl
-org.onosproject.incubator.store.config.impl
-org.onosproject.incubator.net.meter.impl
-org.onosproject.incubator.net.resource.label
-org.onosproject.incubator.store.meter.impl
diff --git a/docs/internal-incubator-apis b/docs/internal-incubator-apis
deleted file mode 100644
index df9ddbc..0000000
--- a/docs/internal-incubator-apis
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.incubator*
diff --git a/docs/internal-isis b/docs/internal-isis
deleted file mode 100644
index ecd7a36..0000000
--- a/docs/internal-isis
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.isis*
diff --git a/docs/internal-lisp b/docs/internal-lisp
deleted file mode 100644
index 23e8e51..0000000
--- a/docs/internal-lisp
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.lisp*
diff --git a/docs/internal-netconf b/docs/internal-netconf
deleted file mode 100644
index 161ad9c..0000000
--- a/docs/internal-netconf
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.netconf*
-org.onosproject.provider.netconf*
diff --git a/docs/internal-openflow b/docs/internal-openflow
deleted file mode 100644
index c84cf13..0000000
--- a/docs/internal-openflow
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.openflow.*
-org.onosproject.provider.of.*
diff --git a/docs/internal-ospf b/docs/internal-ospf
deleted file mode 100644
index 7fec14e..0000000
--- a/docs/internal-ospf
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.ospf*
diff --git a/docs/internal-ovsdb b/docs/internal-ovsdb
deleted file mode 100644
index 4b4ccb7..0000000
--- a/docs/internal-ovsdb
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.provider.ovsdb*
-org.onosproject.ovsdb*
diff --git a/docs/internal-pcep b/docs/internal-pcep
deleted file mode 100644
index f559bb0..0000000
--- a/docs/internal-pcep
+++ /dev/null
@@ -1,6 +0,0 @@
-org.onosproject.pce.*
-org.onosproject.pcerest*
-org.onosproject.pceweb*
-org.onosproject.pcep*
-org.onosproject.pcepio*
-org.onosproject.provider.pcep*
diff --git a/docs/internal-providers b/docs/internal-providers
deleted file mode 100644
index 11871cd..0000000
--- a/docs/internal-providers
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.provider.*
-org.onosproject.protocol.*
diff --git a/docs/internal-restsb b/docs/internal-restsb
deleted file mode 100644
index 971c843..0000000
--- a/docs/internal-restsb
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.protocol.rest*
-org.onosproject.provider.rest*
diff --git a/docs/internal-snmp b/docs/internal-snmp
deleted file mode 100644
index c4629bb..0000000
--- a/docs/internal-snmp
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.snmp*
diff --git a/docs/internal-stores b/docs/internal-stores
deleted file mode 100644
index 1f1f05a..0000000
--- a/docs/internal-stores
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.store.*
-org.onosproject.persistence.impl
diff --git a/docs/internal-test-apps b/docs/internal-test-apps
deleted file mode 100644
index bc5276c..0000000
--- a/docs/internal-test-apps
+++ /dev/null
@@ -1,7 +0,0 @@
-org.onosproject.metrics.*
-org.onosproject.demo*
-org.onosproject.election*
-org.onosproject.distributedprimitives*
-org.onosproject.intentperf*
-org.onosproject.messagingperf*
-org.onosproject.optical.testapp*
diff --git a/docs/internal.xml b/docs/internal.xml
deleted file mode 100644
index a9e7686..0000000
--- a/docs/internal.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright 2015-present Open Networking Foundation
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0.0</maven>
- </prerequisites>
-
- <parent>
- <groupId>org.onosproject</groupId>
- <artifactId>onos</artifactId>
- <version>1.15.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>onos-docs</artifactId>
- <packaging>pom</packaging>
-
- <description>ONOS Java API documentation</description>
-
- <modules>
- <module>..</module>
- </modules>
-
- <url>http://onosproject.org/</url>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <show>package</show>
- <docfilessubdirs>true</docfilessubdirs>
- <doctitle>ONOS Java API (1.15.0-SNAPSHOT)</doctitle>
- <excludePackageNames>@internal-excludes</excludePackageNames>
- <sourceFileExcludes>
- <sourceFileExclude>**/generated-sources/**</sourceFileExclude>
- </sourceFileExcludes>
-
- <groups>
- <group>
- <title>Network Model & Services</title>
- <packages>@internal-apis</packages>
- </group>
- <group>
- <title>Incubator for Network Model & Services
- </title>
- <packages>@internal-incubator-apis</packages>
- </group>
- <group>
- <title>Core Subsystems</title>
- <packages>@internal-core</packages>
- </group>
- <group>
- <title>Distributed Stores</title>
- <packages>@internal-stores</packages>
- </group>
- <group>
- <title>Incubator for Core Subsystems & Distributed Stores
- </title>
- <packages>@internal-incubator</packages>
- </group>
- <group>
- <title>Utilities</title>
- <packages>@utils</packages>
- </group>
- <group>
- <title>GUI, REST & Command-Line</title>
- <packages>@internal-gui-rest-cli</packages>
- </group>
- <group>
- <title>Builtin Applications</title>
- <packages>@internal-apps</packages>
- </group>
- <group>
- <title>Test Instrumentation & Applications
- </title>
- <packages>@internal-test-apps</packages>
- </group>
- <group>
- <title>OpenFlow Providers & Controller</title>
- <packages>@internal-openflow</packages>
- </group>
- <group>
- <title>NetConf Protocol & Providers</title>
- <packages>@internal-netconf</packages>
- </group>
- <group>
- <title>OVSDB Protocol & Providers</title>
- <packages>@internal-ovsdb</packages>
- </group>
- <group>
- <title>PCEP Protocol & Providers</title>
- <packages>@internal-pcep</packages>
- </group>
- <group>
- <title>BGP-LS Protocol & Providers</title>
- <packages>@internal-bgpls</packages>
- </group>
- <group>
- <title>OSPF Protocol & Providers</title>
- <packages>@internal-ospf</packages>
- </group>
- <group>
- <title>ISIS Protocol & Providers</title>
- <packages>@internal-isis</packages>
- </group>
- <group>
- <title>LISP Protocol & Providers</title>
- <packages>@internal-lisp</packages>
- </group>
- <group>
- <title>SNMP Protocol & Providers</title>
- <packages>@internal-snmp</packages>
- </group>
- <group>
- <title>REST Protocol & Providers</title>
- <packages>@internal-restsb</packages>
- </group>
- <group>
- <title>Other Providers</title>
- <packages>@internal-providers</packages>
- </group>
- <group>
- <title>Device Drivers</title>
- <packages>@internal-drivers</packages>
- </group>
- </groups>
- <tags>
- <tag>
- <name>onos.rsModel</name>
- <placement>m</placement>
- <head>Json model for REST api:</head>
- </tag>
- </tags>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/docs/utils b/docs/utils
deleted file mode 100644
index b4efc06..0000000
--- a/docs/utils
+++ /dev/null
@@ -1 +0,0 @@
-org.onlab.*
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireMap.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireMap.java
index 83ab0c0..410f85e 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireMap.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/map/ExpireMap.java
@@ -37,7 +37,7 @@
* we assign a value of 0, the map entry will be immediately
* remove from the map.
*
- * @throws UnsupportedOperationException if the <tt>put</tt> operation
+ * @throws UnsupportedOperationException if the <code>put</code> operation
* is not supported by this map
* @throws ClassCastException if the class of the specified key or value
* prevents it from being stored in this map
@@ -57,7 +57,7 @@
* @param key key with which the specified value is to be associated
* @param value value to be associated with the specified key
*
- * @throws UnsupportedOperationException if the <tt>put</tt> operation
+ * @throws UnsupportedOperationException if the <code>put</code> operation
* is not supported by this map
* @throws ClassCastException if the class of the specified key or value
* prevents it from being stored in this map
@@ -86,20 +86,20 @@
* Removes all of the mappings from this map (optional operation).
* The map will be empty after this call returns.
*
- * @throws UnsupportedOperationException if the <tt>clear</tt> operation
+ * @throws UnsupportedOperationException if the <code>clear</code> operation
* is not supported by this map
*/
void clear();
/**
- * Returns <tt>true</tt> if this map contains a mapping for the specified
- * key. More formally, returns <tt>true</tt> if and only if
- * this map contains a mapping for a key <tt>k</tt> such that
- * <tt>(key==null ? k==null : key.equals(k))</tt>. (There can be
+ * Returns <code>true</code> if this map contains a mapping for the specified
+ * key. More formally, returns <code>true</code> if and only if
+ * this map contains a mapping for a key <code>k</code> such that
+ * <code>(key==null ? k==null : key.equals(k))</code>. (There can be
* at most one such mapping.)
*
* @param key key whose presence in this map is to be tested
- * @return <tt>true</tt> if this map contains a mapping for the specified
+ * @return <code>true</code> if this map contains a mapping for the specified
* key
* @throws ClassCastException if the key is of an inappropriate type for
* this map
@@ -113,12 +113,12 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation), the results of
+ * the iterator's own <code>remove</code> operation), the results of
* the iteration are undefined. The set supports element removal,
* which removes the corresponding mapping from the map, via the
- * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
- * operations. It does not support the <tt>add</tt> or <tt>addAll</tt>
+ * <code>Iterator.remove</code>, <code>Set.remove</code>,
+ * <code>removeAll</code>, <code>retainAll</code>, and <code>clear</code>
+ * operations. It does not support the <code>add</code> or <code>addAll</code>
* operations.
*
* @return a set view of the keys contained in this map
@@ -130,36 +130,36 @@
* The collection is backed by the map, so changes to the map are
* reflected in the collection, and vice-versa. If the map is
* modified while an iteration over the collection is in progress
- * (except through the iterator's own <tt>remove</tt> operation),
+ * (except through the iterator's own <code>remove</code> operation),
* the results of the iteration are undefined. The collection
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt> and <tt>clear</tt> operations. It does not
- * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the <code>Iterator.remove</code>,
+ * <code>Collection.remove</code>, <code>removeAll</code>,
+ * <code>retainAll</code> and <code>clear</code> operations. It does not
+ * support the <code>add</code> or <code>addAll</code> operations.
*
* @return a collection view of the values contained in this map
*/
Collection<V> values();
/**
- * Returns <tt>true</tt> if this map contains no key-value mappings.
+ * Returns <code>true</code> if this map contains no key-value mappings.
*
- * @return <tt>true</tt> if this map contains no key-value mappings
+ * @return <code>true</code> if this map contains no key-value mappings
*/
boolean isEmpty();
/**
* Removes the mapping for a key from this map if it is present
* (optional operation). More formally, if this map contains a mapping
- * from key <tt>k</tt> to value <tt>v</tt> such that
+ * from key <code>k</code> to value <code>v</code> such that
* <code>(key==null ? k==null : key.equals(k))</code>, that mapping
* is removed. (The map can contain at most one such mapping.)
*
* @param key key whose mapping is to be removed from the map
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>.
- * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+ * @return the previous value associated with <code>key</code>, or
+ * <code>null</code> if there was no mapping for <code>key</code>.
+ * @throws UnsupportedOperationException if the <code>remove</code> operation
* is not supported by this map
* @throws ClassCastException if the key is of an inappropriate type for
* this map
@@ -170,8 +170,8 @@
/**
* Returns the number of key-value mappings in this map. If the
- * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
- * <tt>Integer.MAX_VALUE</tt>.
+ * map contains more than <code>Integer.MAX_VALUE</code> elements, returns
+ * <code>Integer.MAX_VALUE</code>.
*
* @return the number of key-value mappings in this map
*/
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/tree/IpRadixTree.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/tree/IpRadixTree.java
index b9a50a5..ab5bcbf 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/tree/IpRadixTree.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/tree/IpRadixTree.java
@@ -56,7 +56,7 @@
/**
* Removes the mapping for a address from this radix tree if it is present
* (optional operation). More formally, if this radix tree contains a
- * mapping from address <tt>address</tt> to value <tt>v</tt> such that
+ * mapping from address <code>address</code> to value <code>v</code> such that
* <code>(address==null ? address==null : address.equals(k))</code>,
* that mapping is removed. (The radix tree can contain at most one
* such mapping.)
diff --git a/tools/build/onos-build-docs b/tools/build/onos-build-docs
index 3be4c0a..f13f47a 100755
--- a/tools/build/onos-build-docs
+++ b/tools/build/onos-build-docs
@@ -3,4 +3,4 @@
# Builds the aggregate ONOS Java API docs.
# -----------------------------------------------------------------------------
-SHLVL=1 bazel build //docs:external //docs:internal
+SHLVL=1 bazel build //docs:external # //docs:internal