[DMAAP-MR] Update certs etc

[dmaap/messagerouter/messageservice.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 5f697fd..80fe6b9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,12 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.2.1</version>
+               <version>2.1.0</version>
        </parent>
 
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.1.15-SNAPSHOT</version>
+       <version>1.1.19-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
        <licenses>
@@ -47,7 +47,28 @@
 
        <build>
                <plugins>
-
+             <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>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
@@ -141,7 +162,7 @@
                <!-- <javax-mail-version>1.5.0</javax-mail-version> -->
                <module.ajsc.namespace.name>dmaap</module.ajsc.namespace.name>
                <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-               <ajscRuntimeVersion>3.0.10-oss</ajscRuntimeVersion>
+               <ajscRuntimeVersion>3.0.11-oss</ajscRuntimeVersion>
 
                <!-- This will be the Absolute Root of the Project and should contain NO 
                        Versioning -->
@@ -172,7 +193,8 @@
                <!-- <dmaapImg>${project.version}</dmaapImg> -->
                <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-               <camel.version>2.21.1</camel.version>
+               <camel.version>2.21.5</camel.version>
+               <camel.version.latest>3.5.0</camel.version.latest>
                <sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath>
                <skip.docker.build>true</skip.docker.build>
                <skip.docker.tag>true</skip.docker.tag>
@@ -180,6 +202,11 @@
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
                <spring.version>3.2.18.RELEASE</spring.version>
+               <sonar.language>java</sonar.language>
+        <sonar.skip>false</sonar.skip>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
        </properties>
 
        <!-- Distribution management -->
@@ -280,15 +307,57 @@
                        part of the JDK now <exclusion> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> 
                        </exclusion> </exclusions> </dependency> -->
 
-               <dependency>
-                       <groupId>org.apache.zookeeper</groupId>
-                       <artifactId>zookeeper</artifactId>
-                       <version>3.4.10</version>
-               </dependency>
+       <dependency>
+       <groupId>org.apache.zookeeper</groupId>
+       <artifactId>zookeeper</artifactId>
+       <version>3.4.14</version>
+   </dependency>
+   <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.6.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+       <dependency>
+               <groupId>org.apache.kafka</groupId>
+               <artifactId>kafka_2.11</artifactId>
+               <version>2.3.0</version>
+       </dependency>
+       <dependency>
+               <groupId>commons-codec</groupId>
+               <artifactId>commons-codec</artifactId>
+               <version>1.14</version>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.7</version>
+       </dependency>
+       <dependency>
+               <groupId>org.quartz-scheduler</groupId>
+               <artifactId>quartz</artifactId>
+               <version>2.3.2</version>
+       </dependency>
+       <dependency>
+               <groupId>com.fasterxml.woodstox</groupId>
+               <artifactId>woodstox-core</artifactId>
+               <version>5.3.0</version>
+       </dependency>
                <dependency>
                        <groupId>org.grails</groupId>
                        <artifactId>grails-bootstrap</artifactId>
-                       <version>2.5.4</version>
+                       <version>4.0.1</version>
                        <scope>compile</scope>
                        <exclusions>
                                <exclusion>
@@ -333,6 +402,11 @@
                                </exclusion>
                        </exclusions>
                </dependency>
+               <dependency>
+                       <groupId>commons-fileupload</groupId>
+                       <artifactId>commons-fileupload</artifactId>
+                       <version>1.4</version>
+               </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-webmvc</artifactId>
@@ -354,11 +428,6 @@
                        <artifactId>spring-context</artifactId>
                        <version>4.3.18.RELEASE</version>
                </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.4</version>
-               </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-io</artifactId>
@@ -367,8 +436,12 @@
                <dependency>
                        <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
                        <artifactId>msgrtr</artifactId>
-                       <version>1.1.17</version>
+                       <version>1.1.23</version>
                        <exclusions>
+                               <exclusion>
+                                       <groupId>org.apache.kafka</groupId>
+                               <artifactId>kafka_2.11</artifactId>
+                               </exclusion>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>
                                        <artifactId>slf4j-log4j12</artifactId>
@@ -401,6 +474,10 @@
                                        <groupId>commons-beanutils</groupId>
                                        <artifactId>commons-beanutils</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>javax.mail</groupId>
+                                       <artifactId>mail</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@ -436,13 +513,13 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>2.8.11</version>
+                       <version>2.11.2</version>
                </dependency>
 
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.8.11.1</version>
+                       <version>2.11.2</version>
                </dependency>
                <dependency>
                        <groupId>org.grails</groupId>
@@ -508,7 +585,7 @@
                <dependency>
                        <groupId>com.att.ajsc</groupId>
                        <artifactId>ajsc-archetype-parent</artifactId>
-                       <version>3.0.10-oss</version>
+                       <version>3.0.11-oss</version>
                        <type>pom</type>
                </dependency>
 
@@ -525,7 +602,7 @@
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-core</artifactId>
-                       <version>${camel.version}</version>
+                       <version>3.4.0</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.camel</groupId>
@@ -535,7 +612,7 @@
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-spring</artifactId>
-                       <version>${camel.version}</version>
+                       <version>${camel.version.latest}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.camel</groupId>
@@ -572,7 +649,7 @@
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-groovy</artifactId>
-                       <version>${camel.version}</version>
+                       <version>${camel.version.latest}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.camel</groupId>
@@ -612,18 +689,18 @@
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-velocity</artifactId>
-                       <version>${camel.version}</version>
+                       <version>${camel.version.latest}</version>
                </dependency>
                <dependency>
                        <groupId>com.att.ajsc</groupId>
                        <artifactId>ajsc-runner</artifactId>
-                       <version>3.0.10-oss</version>
+                       <version>3.0.11-oss</version>
                        <scope>runtime</scope>
                </dependency>
                <dependency>
                        <groupId>com.att.ajsc</groupId>
                        <artifactId>ajsc-core</artifactId>
-                       <version>3.0.10-oss</version>
+                       <version>3.0.11-oss</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>