Merge changes I17a289cd,Ie0d50a2c
[dmaap/messagerouter/msgrtr.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 449f88d..2428f29 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
        <artifactId>msgrtr</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.19-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>dmaap-messagerouter-msgrtr</name>
        <description>Message Router - Restful interface built for kafka</description>
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
+               <version>2.0.0</version>
        </parent>
 
        <properties>
+           <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
                <spring.version>3.2.18.RELEASE</spring.version>
                <cxf.version>3.0.4</cxf.version>
                <jstl.version>1.2</jstl.version>
                <maven.compiler.target>1.7</maven.compiler.target>
                <maven.compiler.source>1.7</maven.compiler.source>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
 
                <!-- SONAR -->
                <jacoco.version>0.7.7.201606060606</jacoco.version>
        </developers>
 
        <dependencies>
-           <dependency>
+           <!-- <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-catalina</artifactId>
-                       <version>8.0.47</version>
+                       <version>8.5.23</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-util</artifactId>
-                       <version>8.0.47</version>
+                       <version>8.5.23</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.tomcat.embed</groupId>
                        <artifactId>tomcat-embed-core</artifactId>
-                       <version>8.0.47</version>
-               </dependency>
+                       <version>8.5.23</version>
+               </dependency> -->
                <dependency>
                        <groupId>commons-collections</groupId>
                        <artifactId>commons-collections</artifactId>
                <dependency>
                        <groupId>org.codehaus.groovy</groupId>
                        <artifactId>groovy-all</artifactId>
-                       <version>2.4.4</version>
+                       <version>2.4.8</version>
                        <scope>compile</scope>
                        <exclusions>
                                <exclusion>
                <dependency>
                        <groupId>commons-fileupload</groupId>
                        <artifactId>commons-fileupload</artifactId>
-                       <version>1.3.3</version>
+                       <version>1.4</version>
                </dependency>
 
                <dependency>
                        <groupId>com.att.aft</groupId>
                        <artifactId>dme2</artifactId>
                        <version>3.1.200-oss</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>javax.jms</groupId>
+                                       <artifactId>jms</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
 
                <!-- slf4j logger -->
                <!-- Begin - Spring Dependencies for DI -->
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>spring-core</artifactId>
+                       <artifactId>spring-context</artifactId>
                        <version>${spring.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <version>${spring.version}</version>
+                       <artifactId>spring-expression</artifactId>
+                       <version>4.3.18.RELEASE</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-webmvc</artifactId>
-                       <version>${spring.version}</version>
+                       <version>4.3.18.RELEASE</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>spring-web</artifactId>
-                       <version>${spring.version}</version>
+                       <artifactId>spring-core</artifactId>
+                       <version>4.3.18.RELEASE</version>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
                <dependency>
                        <groupId>org.apache.zookeeper</groupId>
                        <artifactId>zookeeper</artifactId>
-                       <version>3.4.10</version>
+                       <version>3.4.14</version>
                </dependency>
 
                <!-- JSON libraries -->
                <!-- Apache Kafka -->
                <dependency>
                        <groupId>org.apache.kafka</groupId>
-                       <artifactId>kafka_2.10</artifactId>
-                       <version>0.8.2.1</version>
+                       <artifactId>kafka_2.11</artifactId>
+               <version>0.11.0.3</version>
                </dependency>
+       <dependency>
+               <groupId>com.google.guava</groupId>
+               <artifactId>guava</artifactId>
+               <version>23.6.1-jre</version>
+       </dependency>
 
                <dependency>
                        <groupId>com.att.eelf</groupId>
                        <groupId>com.att.nsa</groupId>
                        <artifactId>nsaServerLibrary</artifactId>
                        <version>1.0.10</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.apache.tomcat</groupId>
+                                       <artifactId>tomcat-catalina</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.apache.tomcat.embed</groupId>
+                                       <artifactId>tomcat-embed-core</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.apache.tomcat</groupId>
+                                       <artifactId>tomcat-util</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>javax.mail</groupId>
+                                       <artifactId>mail</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>com.att.nsa</groupId>
                        <artifactId>saToolkit</artifactId>
                        <version>0.0.1</version>
                </dependency>
+               <dependency>
+               <groupId>com.sun.mail</groupId>
+               <artifactId>javax.mail</artifactId>
+               <version>1.6.0</version>
+               <exclusions>
+                       <!-- javax activation is part of the JDK now -->
+                       <exclusion>
+                               <groupId>javax.activation</groupId>
+                               <artifactId>activation</artifactId>
+                       </exclusion>
+               </exclusions>
+               </dependency>
 
                <!-- our Highland Park library -->
                <!-- <dependency> <groupId>com.att.nsa</groupId> <artifactId>highlandParkCore</artifactId> 
                <dependency>
                        <groupId>org.apache.curator</groupId>
                        <artifactId>curator-recipes</artifactId>
-                       <version>2.6.0</version>
+                       <version>4.0.1</version>
                </dependency>
 
                <dependency>
                        <groupId>org.apache.curator</groupId>
                        <artifactId>curator-test</artifactId>
-                       <version>2.6.0</version>
+                       <version>4.0.1</version>
                </dependency>
 
 
                        <!-- <phase>package</phase> bind to the packaging phase <goals> <goal>single</goal> 
                                </goals> </execution> </executions> </plugin> -->
                        <!-- -->
+                         <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.onap.oparent</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>2.0.0</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>onap-license</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>process-sources</phase>
+            <configuration>
+              <configLocation>onap-checkstyle/check-license.xml</configLocation>
+              <includeResources>false</includeResources>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+              <includeTestResources>false</includeTestResources>
+              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <excludes>
+              </excludes>
+              <consoleOutput>true</consoleOutput>
+              <failsOnViolation>false</failsOnViolation>
+            </configuration>
+          </execution>
+          <execution>
+            <id>onap-java-style</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>none</phase>
+            <configuration>
+              <!-- Use Google Java Style Guide:
+                   https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                   with minor changes -->
+              <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+              <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
+              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <includeResources>true</includeResources>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+              <includeTestResources>true</includeTestResources>
+              <excludes>
+              </excludes>
+              <consoleOutput>true</consoleOutput>
+              <failsOnViolation>false</failsOnViolation>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>