Merge "use encrypted auth for dmaap"
[so.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 078f9b3..d7664ef 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
        <groupId>org.onap.so</groupId>
        <artifactId>so</artifactId>
        <packaging>pom</packaging>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.4.0-SNAPSHOT</version>
        <name>so</name>
        <description>This Maven project is responsible to build and package all child projects - contributions in the MSO project.
        This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB.
@@ -47,9 +47,9 @@
                <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
                <jacoco.version>0.7.5.201505241946</jacoco.version>
                <org.apache.maven.user-settings/>
-               <openstack.version>1.2.2</openstack.version>
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
-               <springboot.version>1.5.13.RELEASE</springboot.version> 
+               <!-- TODO: update to version 1.4.0 for Dublin -->
+               <openstack.version>1.4.0-SNAPSHOT</openstack.version>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>            
                <originalClassifier>original</originalClassifier>
                <docker.skip>true</docker.skip>
                <docker.skip.build>true</docker.skip.build>
                <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
                <publicNexusPath>content/repositories/public/</publicNexusPath>
                <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
-               <cxf.version>3.2.5</cxf.version>
+               <cxf.version>3.2.6</cxf.version>
                <jax.ws.rs>2.1</jax.ws.rs>
+               <springboot.version>2.0.5.RELEASE</springboot.version>  
+               <camunda.springboot.version>3.0.0</camunda.springboot.version>
        </properties>
        <distributionManagement>
                <repository>
                                                </execution>
                                        </executions>
                                </plugin>
+                               <plugin>
+                                       <groupId>org.springframework.boot</groupId>
+                                       <artifactId>spring-boot-maven-plugin</artifactId>
+                                       <version>${springboot.version}</version>
+                                       <executions>
+                                               <execution>
+                                                       <id>build-info</id>
+                                                       <goals>
+                                                               <goal>build-info</goal>
+                                                       </goals>
+                                               </execution>
+                                       </executions>
+                               </plugin>
                        </plugins>
                </pluginManagement>
        </build>
        <dependencies>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>
-                       <version>2.8.10</version>
+                       <artifactId>jackson-core</artifactId>                   
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jaxb-annotations</artifactId>
-                       <version>2.4.0</version>
+                       <artifactId>jackson-module-jaxb-annotations</artifactId>                        
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>2.8.10</version>
+                       <artifactId>jackson-databind</artifactId>                       
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-                       <version>2.8.10</version>
+                       <artifactId>jackson-annotations</artifactId>                    
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                       <artifactId>jackson-jaxrs-base</artifactId>
-                       <version>2.9.2</version>
+                       <artifactId>jackson-jaxrs-base</artifactId>                     
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                       <artifactId>jackson-jaxrs-json-provider</artifactId>
-                       <version>2.9.2</version>
+                       <artifactId>jackson-jaxrs-json-provider</artifactId>                    
                </dependency>
                <dependency>
                        <groupId>javax.ws.rs</groupId>
                        <artifactId>javax.inject</artifactId>
                        <version>1</version>
                </dependency>
-               <dependency>
-                       <groupId>org.hamcrest</groupId>
-                       <artifactId>hamcrest-core</artifactId>
-                       <version>1.3</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.hamcrest</groupId>
-                       <artifactId>hamcrest-all</artifactId>
-                       <version>1.3</version>
-               </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <version>1.10.19</version>
-                       <scope>test</scope>
+                       <artifactId>mockito-core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
-                       <version>1.6.2</version>
-                       <scope>test</scope>
+                       <groupId>org.hamcrest</groupId>
+                       <artifactId>hamcrest-core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <version>1.6.2</version>
-                       <scope>test</scope>
+                       <groupId>org.hamcrest</groupId>
+                       <artifactId>hamcrest-library</artifactId>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
+                       <artifactId>junit</artifactId>          
                        <scope>test</scope>
                </dependency>
                <dependency>
                <dependency>
                        <groupId>org.assertj</groupId>
                        <artifactId>assertj-core</artifactId>
-                       <version>3.9.0</version>
+                       <version>3.11.1</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
                        <!-- force use of version 4.5 everywhere in transient deps, aligned on 
                                WildFly 10 version -->
-                       <dependency>
-                               <groupId>org.apache.httpcomponents</groupId>
-                               <artifactId>httpclient</artifactId>
-                               <version>4.5.5</version>
-                               <scope>compile</scope>
-                       </dependency>
                        <dependency>
                                <groupId>org.apache.httpcomponents</groupId>
                                <artifactId>httpcore</artifactId>
                                <artifactId>commons-io</artifactId>
                                <version>2.5</version>
                                <scope>compile</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>log4j</groupId>
-                               <artifactId>log4j</artifactId>
-                               <version>1.2.17</version>
-                               <scope>compile</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.slf4j</groupId>
-                               <artifactId>slf4j-api</artifactId>
-                               <version>1.7.15</version>
-                               <scope>compile</scope>
-                       </dependency>
+                       </dependency>           
                        <dependency>
                                <groupId>com.sun.xml.fastinfoset</groupId>
                                <artifactId>FastInfoset</artifactId>
                        <dependency>
                                <groupId>org.yaml</groupId>
                                <artifactId>snakeyaml</artifactId>
-                               <version>1.15</version>
+                               <version>1.23</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.interceptor</groupId>
+                               <artifactId>javax.interceptor-api</artifactId>
+                               <version>1.2.2</version>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.boot</groupId>
                                </exclusions>
                        </dependency>
                        <dependency>
-                           <groupId>net.javacrumbs.shedlock</groupId>
-                           <artifactId>shedlock-spring</artifactId>
-                           <version>0.18.2</version>
+                               <groupId>net.javacrumbs.shedlock</groupId>
+                               <artifactId>shedlock-spring</artifactId>
+                               <version>0.18.2</version>
                        </dependency>
                        <dependency>
-                           <groupId>net.javacrumbs.shedlock</groupId>
-                           <artifactId>shedlock-provider-jdbc-template</artifactId>
-                           <version>0.18.2</version>
+                               <groupId>net.javacrumbs.shedlock</groupId>
+                               <artifactId>shedlock-provider-jdbc-template</artifactId>
+                               <version>0.18.2</version>
                        </dependency>
                        <dependency>
-                           <groupId>net.javacrumbs.shedlock</groupId>
-                           <artifactId>shedlock-provider-jdbc-template</artifactId>
-                           <version>0.18.2</version>
+                               <groupId>org.flywaydb</groupId>
+                               <artifactId>flyway-core</artifactId>
+                               <version>5.1.4</version>
                        </dependency>
                        <dependency>
-                       <groupId>org.flywaydb</groupId>
-                       <artifactId>flyway-core</artifactId>
-                       <version>4.2.0</version>
+                               <groupId>org.json</groupId>
+                               <artifactId>json</artifactId>
+                               <version>20140107</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.yaml</groupId>
+                               <artifactId>snakeyaml</artifactId>
+                               <version>1.19</version>
                        </dependency>
                </dependencies>
        </dependencyManagement>