X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=70223ab614a6d2283295ff943e4071159141dad0;hb=1a98056fd4e55e38750371ca409a1d930f8962cf;hp=7a524b57be5546f76e8d56978dca7e7d3a862263;hpb=bceb18df30982e2ace538baf5c49336fe0e45b0a;p=dmaap%2Fdatarouter.git

diff --git a/pom.xml b/pom.xml
index 7a524b57..70223ab6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.3</version>
+        <version>2.1.0</version>
     </parent>
     <properties>
-        <!--revision can be set in the version.properties file at project root and is loaded by all sub modules-->
-        <revision>${snapshot_version}</revision>
+        <!--revision must also be set in the version.properties file at project root-->
+        <revision>2.1.5-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -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>
@@ -61,15 +59,15 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 
         <!--dependency version across all modules-->
-        <jetty.version>9.4.14.v20181114</jetty.version>
+        <jetty.version>9.4.20.v20190813</jetty.version>
         <javax.mail-api.version>1.5.5</javax.mail-api.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <qos.logback.version>1.2.3</qos.logback.version>
-        <aaf-cadi-aaf.version>2.1.10</aaf-cadi-aaf.version>
-        <commons-codec.version>1.10</commons-codec.version>
+        <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>
@@ -85,7 +83,6 @@
         <sl4j-api.version>1.7.25</sl4j-api.version>
         <hamcrest-lib.version>1.3</hamcrest-lib.version>
         <annotations.version>12.0</annotations.version>
-        <xstream.version>1.4.10</xstream.version>
     </properties>
     <modules>
         <module>datarouter-prov</module>
@@ -199,11 +196,16 @@
                 <groupId>org.sonatype.http-testing-harness</groupId>
                 <artifactId>junit-runner</artifactId>
                 <version>${junit-runner.version}</version>
+                <scope>test</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.databene</groupId>
                         <artifactId>contiperf</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.thoughtworks.xstream</groupId>
+                        <artifactId>xstream</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -257,19 +259,10 @@
                 <artifactId>json</artifactId>
                 <version>${json.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.thoughtworks.xstream</groupId>
-                <artifactId>xstream</artifactId>
-                <version>${xstream.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -314,7 +307,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.0</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>
@@ -440,25 +432,31 @@
                         </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>
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>DR Release Repository</name>
-            <url>${onap.nexus.url}${releaseNexusPath}</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>DR Snapshot Repository</name>
-            <url>${onap.nexus.url}${snapshotNexusPath}</url>
-        </snapshotRepository>
-        <site>
-            <id>ecomp-site</id>
-            <url>dav:${onap.nexus.url}${sitePath}</url>
-        </site>
-    </distributionManagement>
     <pluginRepositories>
         <pluginRepository>
             <id>onap-plugin-snapshots</id>