X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=a27c149079d0927a3059e53f3003b286e334896c;hb=888a1dc070dd6b2d7df7dcd8f180b84dc1e153a3;hp=8a954e1fc753fb1e7c44075035f0049ede5bd1c4;hpb=45a9add1e79bad75405e5b93d614201ceabdd0d6;p=so.git

diff --git a/pom.xml b/pom.xml
index 8a954e1fc7..a27c149079 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,8 +49,7 @@
     <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
     <jacoco.version>0.7.5.201505241946</jacoco.version>
     <org.apache.maven.user-settings />
-    <!-- TODO: update to version 1.4.0 for Dublin -->
-    <openstack.version>1.4.0-SNAPSHOT</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>
@@ -71,6 +70,7 @@
     <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>
@@ -210,7 +210,7 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
+      <!-- <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
         <version>1.6.7</version>
@@ -220,11 +220,12 @@
           <stagingProfileId>176c31dfe190a</stagingProfileId>
           <serverId>ecomp-staging</serverId>
         </configuration>
-      </plugin>
+      </plugin> -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8</version> <!-- This version supports the "deployAtEnd" parameter -->
+        <version>2.8</version>
+        <!-- This version supports the "deployAtEnd" parameter -->
         <configuration>
           <skip />
         </configuration>
@@ -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,12 +455,13 @@
             <goals>
               <goal>format</goal>
             </goals>
+            <phase>process-sources</phase>
             <configuration>
               <skip>${format.skipExecute}</skip>
               <sourceDirectory>${project.basedir}</sourceDirectory>
               <configXmlFile>${base-path}/project-configs/code-tools/pom-format.properties</configXmlFile>
               <includes>
-                <include>${project.basedir}/pom.xml</include>
+                <include>pom.xml</include>
               </includes>
             </configuration>
           </execution>
@@ -480,8 +483,8 @@
             <configuration>
               <skip>${format.skipValidate}</skip>
               <configFile>${base-path}/project-configs/code-tools/pom-format.properties</configFile>
-               <includes>
-                <include>${project.basedir}/pom.xml</include>
+              <includes>
+                <include>pom.xml</include>
               </includes>
             </configuration>
           </execution>
@@ -500,16 +503,20 @@
         <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>
             <skipPush>${docker.skip.push}</skipPush>
-            <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 -->
-            <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 -->
+            <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 -->
+            <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 -->
             <images>
               <image>
                 <alias>service</alias>
@@ -784,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>