X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=docs%2Fpom.xml;h=7168d72abb7e8fe9b270a5ce30ff81003baf29eb;hp=022deb54b7d3e25e3d6302243c5c227428a269c9;hb=e258e0fef2bc38e35f09354f0fdd5136c69ad1a7;hpb=839f16e02accbd7883ff75879179890668668f49

diff --git a/docs/pom.xml b/docs/pom.xml
index 022deb54b7..7168d72abb 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,14 +12,14 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.4</version>
+        <version>8.1.1</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>controller-docs</artifactId>
     <packaging>jar</packaging>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>Controller documentation</description>
 
@@ -27,15 +27,8 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
+                <artifactId>controller-artifacts</artifactId>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -44,10 +37,6 @@
 
     <dependencies>
         <!-- Config Subsystem remnants -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-event-executor-config</artifactId>
@@ -69,64 +58,6 @@
             <artifactId>threadpool-config-impl</artifactId>
         </dependency>
 
-        <!-- MD-SAL artifacts -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-core-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-core-compat</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-broker-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-inmemory-datastore</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>mdsal-trace-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>mdsal-trace-dom-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>mdsal-trace-binding-impl</artifactId>
-        </dependency>
-
         <!-- Base model augmentations -->
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
@@ -175,22 +106,23 @@
             <artifactId>cds-dom-api</artifactId>
         </dependency>
 
-        <!-- MessageBus -->
+        <!-- Third-party dependencies -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>messagebus-api</artifactId>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>messagebus-spi</artifactId>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>messagebus-impl</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>messagebus-util</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
     </dependencies>
 
@@ -288,19 +220,20 @@
                 <!-- FIXME: remove this section once we can activate javadoc-links profile -->
                 <configuration combine.children="append">
                     <links>
-                        <link>https://junit.org/junit4/javadoc/4.11/</link>
-                        <link>http://hamcrest.org/JavaHamcrest/javadoc/1.3/</link>
-                        <link>http://google.github.io/truth/api/0.42/</link>
+                        <link>https://junit.org/junit4/javadoc/4.13/</link>
+                        <link>http://hamcrest.org/JavaHamcrest/javadoc/2.2/</link>
+                        <link>http://google.github.io/truth/api/1.0.1/</link>
                         <link>http://www.slf4j.org/apidocs/</link>
-                        <link>https://google.github.io/guava/releases/25.1-jre/api/docs/</link>
-                        <link>http://doc.akka.io/japi/akka/2.5.25/</link>
+                        <link>https://google.github.io/guava/releases/29.0-jre/api/docs/</link>
+                        <link>http://doc.akka.io/japi/akka/2.6.12/</link>
                         <link>http://netty.io/4.1/api/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/4.0.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/5.0.9/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.5/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.6/</link>
                     </links>
                     <groups>
                         <group>
@@ -315,26 +248,10 @@
                             <title>Distributed Datastore DOM API extensions</title>
                             <packages>org.opendaylight.controller.cluster.dom.api</packages>
                         </group>
-                        <group>
-                            <title>MD-SAL Common API (deprecated)</title>
-                            <packages>org.opendaylight.controller.md.sal.common.*</packages>
-                        </group>
-                        <group>
-                            <title>MD-SAL Low-level (DOM) API (deprecated)</title>
-                            <packages>org.opendaylight.controller.md.sal.dom.api:org.opendaylight.controller.md.sal.dom.spi:org.opendaylight.controller.sal.core.*</packages>
-                        </group>
-                        <group>
-                            <title>MD-SAL Binding API (deprecated)</title>
-                            <packages>org.opendaylight.controller.sal.binding.api*:org.opendaylight.controller.md.sal.binding.api*:org.opendaylight.controller.md.sal.binding.spi:org.opendaylight.controller.md.sal.binding.compat:org.opendaylight.controller.md.sal.binding.util</packages>
-                        </group>
                         <group>
                             <title>Akka RAFT implementation</title>
                             <packages>org.opendaylight.controller.cluster.raft*</packages>
                         </group>
-                        <group>
-                            <title>MD-SAL Message Bus Bridge (experimental)</title>
-                            <packages>org.opendaylight.controller.messagebus.*:org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.*</packages>
-                        </group>
                         <group>
                             <title>MD-SAL Tracing Utilities</title>
                             <packages>org.opendaylight.controller.md.sal.trace.*:org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsaltrace.rev160908*</packages>