Merge "Added sonar fixes"

diff --git a/champ-lib/champ-core/pom.xml b/champ-lib/champ-core/pom.xml
index f352c81..df143c4 100644 (file)
--- a/champ-lib/champ-core/pom.xml
+++ b/champ-lib/champ-core/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ.champ-lib</groupId>
@@ -168,9 +168,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>

diff --git a/champ-lib/champ-janus/pom.xml b/champ-lib/champ-janus/pom.xml
index d9966cf..02b375c 100644 (file)
--- a/champ-lib/champ-janus/pom.xml
+++ b/champ-lib/champ-janus/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ.champ-lib</groupId>
@@ -145,9 +145,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>

diff --git a/champ-lib/champ-titan/pom.xml b/champ-lib/champ-titan/pom.xml
index 40e1281..de1426a 100644 (file)
--- a/champ-lib/champ-titan/pom.xml
+++ b/champ-lib/champ-titan/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ.champ-lib</groupId>
@@ -128,9 +128,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>

diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml
index 41085ff..815928f 100644 (file)
--- a/champ-lib/pom.xml
+++ b/champ-lib/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>
@@ -123,9 +123,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>

diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml
index cd104f4..6407f06 100644 (file)
--- a/champ-service-deps-janus/pom.xml
+++ b/champ-service-deps-janus/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>
@@ -330,9 +330,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml
index d43f95c..2b35a34 100644 (file)
--- a/champ-service-deps-titan/pom.xml
+++ b/champ-service-deps-titan/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>
@@ -295,9 +295,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 5311692..93126bd 100644 (file)
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>
@@ -344,37 +344,50 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.11</version>
-                <configuration>
-                    <verbose>true</verbose>
-                    <serverId>docker-hub</serverId>
-                    <imageName>${docker.push.registry}/onap/${docker.name}</imageName>
-                    <dockerDirectory>${docker.location}</dockerDirectory>
-                    <imageTags>
-                        <imageTag>latest</imageTag>
-                    </imageTags>
-                    <forceTags>true</forceTags>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
             </plugin>
-
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.spotify</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.4.11</version>
+                        <configuration>
+                            <verbose>true</verbose>
+                            <serverId>docker-hub</serverId>
+                            <imageName>${docker.push.registry}/onap/${docker.name}</imageName>
+                            <dockerDirectory>${docker.location}</dockerDirectory>
+                            <imageTags>
+                                <imageTag>latest</imageTag>
+                            </imageTags>
+                            <forceTags>true</forceTags>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>default</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals> 
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
 </project>

diff --git a/pom.xml b/pom.xml
index ed2637e..012212e 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -25,18 +25,18 @@ limitations under the License.
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <groupId>org.onap.aai</groupId>
     <artifactId>champ</artifactId>
     <name>aai-champ</name>
     <packaging>pom</packaging>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <event.client.version>1.4.0</event.client.version>
+        <event.client.version>1.5.0</event.client.version>
         <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in
          coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 -->
         <jacoco.line.coverage.limit>0.57</jacoco.line.coverage.limit>
@@ -55,9 +55,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

diff --git a/version.properties b/version.properties
index 66827fd..b11eaff 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=1
-minor_version=4
+minor_version=5
 patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}