X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=common%2Fhoneycomb-parent%2Fpom.xml;h=c45dfcbb3df3b9ed01dc417ebf84ac98682d3cf6;hb=refs%2Fheads%2Fstable%2F1901;hp=e900d713aff6215ebef4a8fd1b7e720d535c1fbe;hpb=08f9d4e68628d280474d04e5ea33f47130cf744a;p=honeycomb.git

diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml
index e900d713a..c45dfcbb3 100644
--- a/common/honeycomb-parent/pom.xml
+++ b/common/honeycomb-parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>honeycomb-parent</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.01-SNAPSHOT</version>
+    <version>1.19.01.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>3.1.1</maven>
@@ -31,37 +31,45 @@
         <nexusproxy>http://nexus.fd.io/content</nexusproxy>
         <odl.nexusproxy>https://nexus.opendaylight.org/content</odl.nexusproxy>
 
-        <!-- Default Sonar configuration -->
-        <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
-        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
-        <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+        <!-- Sonar configuration -->
         <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
         <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**</sonar.exclusions>
+        <!-- https://github.com/SonarSource/sonar-scanning-examples/blob/master/sonarqube-scanner-maven/pom.xml#L24 -->
+        <!-- The destination file for the code coverage report has to be set to the same value
+             in the parent pom and in each module pom. Then JaCoCo will add up information in
+             the same report, so that, it will give the cross-module code coverage. -->
+        <!-- We store jacoco-it.exec in honeycomb-parent because it is built first,
+             so mvn clean won't remove aggregated report. -->
+        <sonar.jacoco.itReportPath>${maven.multiModuleProjectDirectory}/common/honeycomb-parent/target/jacoco-it.exec</sonar.jacoco.itReportPath>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- ODL dependencies -->
-        <yangtools.version>1.0.0-Boron</yangtools.version>
-        <mdsal.version>2.1.0-Boron</mdsal.version>
-        <mdsal.controller.version>1.4.0-Boron</mdsal.controller.version>
-        <mdsalmodel.version>0.9.0-Boron</mdsalmodel.version>
-        <netconf.version>1.1.0-Boron</netconf.version>
-        <restconf.version>1.4.2-Boron-SR2</restconf.version>
+        <odl.yangtools.version>2.0.11</odl.yangtools.version>
+        <odl.mdsal.version>2.5.0</odl.mdsal.version>
+        <odl.mdsal.controller.version>1.8.0</odl.mdsal.controller.version>
+        <odl.mdsalmodel.version>0.13.0</odl.mdsalmodel.version>
+        <odl.netconf.version>1.5.0</odl.netconf.version>
+        <odl.restconf.version>1.8.0</odl.restconf.version>
+        <odl.salGenerator.version>0.13.0</odl.salGenerator.version>
+        <odl.bgpcep.version>0.10.0</odl.bgpcep.version>
         <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
 
-        <!-- dependencies -->
+        <!-- common dependencies -->
         <junit.version>4.11</junit.version>
         <mockito.version>2.2.9</mockito.version>
         <hamcrest.version>1.3</hamcrest.version>
-        <guava.version>18.0</guava.version>
+        <guava.version>23.6-jre</guava.version>
+        <jsr305.version>3.0.0</jsr305.version>
+        <slf4j.version>1.7.21</slf4j.version>
+        <jdt.version>2.1.150</jdt.version>
 
         <!-- plugins -->
         <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
         <checkstyle.version>7.1.2</checkstyle.version>
         <maven.javadoc.version>2.10.3</maven.javadoc.version>
-        <jacoco.version>0.7.2.201409121644</jacoco.version>
+        <jacoco.version>0.7.9</jacoco.version>
         <enforcer.version>1.4</enforcer.version>
         <maven.compile.plugin.version>3.5.1</maven.compile.plugin.version>
         <maven.bundle.version>3.0.1</maven.bundle.version>
@@ -126,42 +134,49 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${odl.yangtools.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.controller.version}</version>
+                <version>${odl.mdsal.controller.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
+                <version>${odl.mdsal.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>${netconf.version}</version>
+                <version>${odl.netconf.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>restconf-artifacts</artifactId>
-                <version>${restconf.version}</version>
+                <version>${odl.restconf.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${mdsalmodel.version}</version>
+                <version>${odl.mdsalmodel.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>bgpcep-artifacts</artifactId>
+                <version>${odl.bgpcep.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -172,6 +187,21 @@
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>${jsr305.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jdt</groupId>
+                <artifactId>org.eclipse.jdt.annotation</artifactId>
+                <version>${jdt.version}</version>
+            </dependency>
 
             <!-- Testing Dependencies -->
             <dependency>
@@ -220,7 +250,8 @@
                             **\/src/main/yang-gen-sal\/,
                             **\/src/main/xtend-gen\/,
                             **\/src/main/yang\/,
-                            **\/archetype-resources\/</excludes>
+                            **\/archetype-resources\/,
+                            **\/.idea\/</excludes>
                     </configuration>
                     <executions>
                         <!-- Override license check configuration to fit Honeycomb coding style-->
@@ -264,13 +295,13 @@
                             <groupId>io.fd.honeycomb.common</groupId>
                             <artifactId>honeycomb-checkstyle</artifactId>
                             <!-- Hardcoded version to prevent archetype generated projects to use their own project version -->
-                            <version>1.17.01-SNAPSHOT</version>
+                            <version>1.19.01.1-SNAPSHOT</version>
                         </dependency>
                         <!-- Necessary for logging checks -->
                         <dependency>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>checkstyle-logging</artifactId>
-                            <version>${yangtools.version}</version>
+                            <version>${odl.yangtools.version}</version>
                         </dependency>
                         <!-- Needed by ODL's checkstyle-logging -->
                         <dependency>
@@ -298,6 +329,17 @@
                         </execution>
                     </executions>
                 </plugin>
+                <!-- Sonar -->
+                <!-- If Maven encounters a plugin with no version declaration, it will use the LATEST version.
+                     which might not be compatible with Sonar server (fd.io uses 6.7.3 currently).
+                     Therefore it is recommended to lock down version of Sonar plugin:
+                     http://blog.sonatype.com/2008/04/maven-209-released/
+                     -->
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>3.4.1.1170</version>
+                </plugin>
                 <!-- jacoco test coverage for sonar -->
                 <plugin>
                     <groupId>org.jacoco</groupId>
@@ -305,25 +347,28 @@
                     <version>${jacoco.version}</version>
                     <executions>
                         <execution>
-                            <id>pre-unit-test</id>
+                            <id>agent-for-ut</id>
                             <goals>
                                 <goal>prepare-agent</goal>
                             </goals>
-                            <configuration>
-                                <destFile>${sonar.jacoco.reportPath}</destFile>
-                            </configuration>
                         </execution>
                         <execution>
-                            <id>post-unit-test</id>
+                            <id>agent-for-it</id>
+                            <goals>
+                                <goal>prepare-agent-integration</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>jacoco-site</id>
                             <goals>
                                 <goal>report</goal>
                             </goals>
-                            <configuration>
-                                <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                            </configuration>
                         </execution>
                     </executions>
                     <configuration>
+                        <!-- Appends data to existing JaCoCo execution file. Required for IT coverage.
+                             Will not affect UT which use separate files. -->
+                        <append>true</append>
                         <excludes>
                             <exclude>**/gen/**</exclude>
                             <exclude>**/generated-sources/**</exclude>
@@ -479,12 +524,26 @@
                                 </source>
                             </configuration>
                         </execution>
+                        <!-- copy generated schema pictures -->
+                        <execution>
+                            <id>copy-generated-pictures</id>
+                            <phase>site</phase>
+                            <goals>
+                                <goal>execute</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Copies generated schema pictures from ascii-doctor folders to site folder-->
+                                <source>
+                                    io.fd.honeycomb.common.scripts.AsciiDocImgForwarder.copyGeneratedImages(project, properties, log)
+                                </source>
+                            </configuration>
+                        </execution>
                     </executions>
                     <dependencies>
                         <dependency>
-                            <groupId>io.fd.honeycomb.common</groupId>
-                            <artifactId>common-scripts</artifactId>
-                            <version>1.17.01-SNAPSHOT</version>
+                            <groupId>io.fd.honeycomb.doc</groupId>
+                            <artifactId>asciidoc-scripts</artifactId>
+                            <version>1.19.01.1-SNAPSHOT</version>
                         </dependency>
                     </dependencies>
                 </plugin>