X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d5cd1f4a0b67a6bff049258abf352eaff2d02388;hb=193105ce3a95fb1682fef0a17c081c2e6ebb8ff5;hp=51681415458017f436c115b908470ee7844eec09;hpb=d0cd4dc3d204e80a7419c97b6b0ec59273984a99;p=so.git

diff --git a/pom.xml b/pom.xml
index 5168141545..d5cd1f4a0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.2.1</version>
+    <version>2.0.0</version>
     <relativePath />
   </parent>
   <groupId>org.onap.so</groupId>
@@ -49,7 +49,7 @@
     <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
     <jacoco.version>0.7.5.201505241946</jacoco.version>
     <org.apache.maven.user-settings />
-    <openstack.version>1.4.0</openstack.version>
+    <openstack.version>1.5.0-SNAPSHOT</openstack.version>
     <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
     <originalClassifier>original</originalClassifier>
     <docker.skip>true</docker.skip>
@@ -66,10 +66,11 @@
     <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
     <cxf.version>3.2.6</cxf.version>
     <jax.ws.rs>2.1</jax.ws.rs>
-    <springboot.version>2.0.5.RELEASE</springboot.version>
+    <springboot.version>2.1.5.RELEASE</springboot.version>
     <camunda.springboot.version>3.2.0</camunda.springboot.version>
     <format.skipValidate>false</format.skipValidate>
     <format.skipExecute>true</format.skipExecute>
+    <io.fabric8.version>4.1.0</io.fabric8.version>
   </properties>
   <distributionManagement>
     <repository>
@@ -209,7 +210,7 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
+      <!-- <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
         <version>1.6.7</version>
@@ -219,7 +220,7 @@
           <stagingProfileId>176c31dfe190a</stagingProfileId>
           <serverId>ecomp-staging</serverId>
         </configuration>
-      </plugin>
+      </plugin> -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -443,6 +444,7 @@
             <goals>
               <goal>format</goal>
             </goals>
+            <phase>process-sources</phase>
             <configuration>
               <skip>${format.skipExecute}</skip>
               <configFile>${base-path}/project-configs/code-tools/onap-eclipse-format.xml</configFile>
@@ -453,6 +455,7 @@
             <goals>
               <goal>format</goal>
             </goals>
+            <phase>process-sources</phase>
             <configuration>
               <skip>${format.skipExecute}</skip>
               <sourceDirectory>${project.basedir}</sourceDirectory>
@@ -500,7 +503,7 @@
         <plugin>
           <groupId>io.fabric8</groupId>
           <artifactId>fabric8-maven-plugin</artifactId>
-          <version>3.5.33</version>
+          <version>${io.fabric8.version}</version>
           <configuration>
             <skip>${docker.skip}</skip>
             <skipBuild>${docker.skip.build}</skipBuild>
@@ -508,12 +511,12 @@
             <dockerHost>${docker.newHost}</dockerHost>
             <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY environment variable -->
             <certPath>${docker.host.cert.path}</certPath>
-            <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" 
-              to maven build command -->
+            <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" to maven build command -->
             <pushRegistry>${dockerPushRepo}</pushRegistry>
             <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username, and password -->
             <pullRegistry>${dockerPullRepo}</pullRegistry>
-            <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username, and password -->
+            <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username, 
+              and password -->
             <images>
               <image>
                 <alias>service</alias>
@@ -788,7 +791,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.10</version>
+        <version>1.12</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -844,18 +847,13 @@
       <dependency>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-core</artifactId>
-        <version>5.1.4</version>
+        <version>5.2.4</version>
       </dependency>
       <dependency>
         <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>
   <profiles>