Fixup javadoc build

javadoc-3.4.0 has problems with scala-parser-combinators, as it cannot
derive its module name. Fix this by downgrading javadoc plugin version
for now.

Change-Id: Ica9274e2afc50306c1620e9f32efc5d7371a7c2b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml
index 149a5d4ebcab561ca573527730ea442760e0965e..41fc636f581c9e4fb4005519b9a4867e479e9b29 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/pom.xml
+++ b/opendaylight/md-sal/cds-access-api/pom.xml
@@ -41,6 +41,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-codec-binfmt</artifactId>
         </dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-codec-binfmt</artifactId>
         </dependency>

+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-tree-api</artifactId>
+        </dependency>

 
         <!-- Testing dependencies -->
         <dependency>
 
         <!-- Testing dependencies -->
         <dependency>


@@ -64,6 +68,15 @@
     </dependencies>
 
     <build>
     </dependencies>
 
     <build>

+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+

         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>

diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml
index d488610689ef9afb9e78af6a26109a53eee4fada..15a48587dde9b6958ac2dfb627aee1d52fb56e0a 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/pom.xml
+++ b/opendaylight/md-sal/cds-access-client/pom.xml
@@ -12,22 +12,33 @@
     <packaging>bundle</packaging>
 
     <dependencies>
     <packaging>bundle</packaging>
 
     <dependencies>

+        <dependency>
+           <groupId>com.google.guava</groupId>
+           <artifactId>guava</artifactId>
+        </dependency>

         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>cds-access-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>cds-access-api</artifactId>
         </dependency>

-
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>repackaged-akka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-clustering-commons</artifactId>
+        </dependency>

         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

-            <artifactId>yang-data-api</artifactId>
+            <artifactId>yang-common</artifactId>

         </dependency>
         <dependency>
         </dependency>
         <dependency>

-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-clustering-commons</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-api</artifactId>

         </dependency>
 
         <dependency>
         </dependency>
 
         <dependency>


@@ -39,17 +50,26 @@
             <artifactId>akka-testkit_2.13</artifactId>
         </dependency>
         <dependency>
             <artifactId>akka-testkit_2.13</artifactId>
         </dependency>
         <dependency>

-           <groupId>com.google.guava</groupId>
-           <artifactId>guava-testlib</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava-testlib</artifactId>

         </dependency>
         <dependency>
         </dependency>
         <dependency>

-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-clustering-commons</artifactId>
-          <type>test-jar</type>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-clustering-commons</artifactId>
+            <type>test-jar</type>

         </dependency>
     </dependencies>
 
     <build>
         </dependency>
     </dependencies>
 
     <build>

+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+

         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>