From: Dominic Lunanuova <dgl@research.att.com>
Date: Thu, 5 Mar 2020 13:53:51 +0000 (+0000)
Subject: Merge "Implementing CSI Docker Benchmark v.1.2.0"
X-Git-Tag: 2.1.5~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=bf72b3396c4a29568ed4093e6cda52c69f322eb7;hp=-c

Merge "Implementing CSI Docker Benchmark v.1.2.0"
---

bf72b3396c4a29568ed4093e6cda52c69f322eb7
diff --combined pom.xml
index 4bd7bbb0,8412e99d..b31a08ad
--- a/pom.xml
+++ b/pom.xml
@@@ -48,8 -48,10 +48,8 @@@
  
          <sonar.language>java</sonar.language>
          <sonar.skip>false</sonar.skip>
 -        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportPaths>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPaths>
 -        <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
 +        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <docker.skip.build>false</docker.skip.build>
@@@ -66,8 -68,8 +66,8 @@@
          <aaf-cadi-aaf.version>2.1.15</aaf-cadi-aaf.version>
          <commons-codec.version>1.13</commons-codec.version>
          <gmaven-plugin.version>1.5</gmaven-plugin.version>
-         <io.fabric8.version>0.28.0</io.fabric8.version>
-         <docker.apiVersion>1.23</docker.apiVersion>
+         <io.fabric8.version>0.33.0</io.fabric8.version>
+         <docker.apiVersion>2.2.54</docker.apiVersion>
          <commons-lang.version>2.4</commons-lang.version>
          <commons-io.version>2.6</commons-io.version>
          <httpcore.version>4.4</httpcore.version>
@@@ -433,28 -435,6 +433,28 @@@
                          </execution>
                      </executions>
                  </plugin>
 +                <plugin>
 +                    <groupId>org.jacoco</groupId>
 +                    <artifactId>jacoco-maven-plugin</artifactId>
 +                    <executions>
 +                        <execution>
 +                            <id>prepare-agent</id>
 +                            <goals>
 +                                <goal>prepare-agent</goal>
 +                            </goals>
 +                        </execution>
 +                        <execution>
 +                            <id>report</id>
 +                            <goals>
 +                                <goal>report</goal>
 +                            </goals>
 +                            <configuration>
 +                                <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
 +                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
 +                            </configuration>
 +                        </execution>
 +                    </executions>
 +                </plugin>
              </plugins>
          </pluginManagement>
      </build>