Change to aai-parent and sonar xml

Issue-ID: AAI-2793
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I611b9b2c2f991083403cdb8c4cddd681411f7646

6 files changed, 9 insertions, 44 deletions

diff --git a/event-client-api/pom.xml b/event-client-api/pom.xml
index 9bf1d6b..95172ec 100644
--- a/event-client-api/pom.xml
+++ b/event-client-api/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.event-client</groupId>
         <artifactId>event-client</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-client-api</artifactId>
diff --git a/event-client-dmaap/pom.xml b/event-client-dmaap/pom.xml
index c7ef842..86b7e39 100644
--- a/event-client-dmaap/pom.xml
+++ b/event-client-dmaap/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.event-client</groupId>
         <artifactId>event-client</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-client-dmaap</artifactId>
diff --git a/event-client-kafka/pom.xml b/event-client-kafka/pom.xml
index 9a17836..bb3afb4 100644
--- a/event-client-kafka/pom.xml
+++ b/event-client-kafka/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.event-client</groupId>
         <artifactId>event-client</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-client-kafka</artifactId>
diff --git a/event-client-rabbitmq/pom.xml b/event-client-rabbitmq/pom.xml
index d90b10f..820d23a 100644
--- a/event-client-rabbitmq/pom.xml
+++ b/event-client-rabbitmq/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.event-client</groupId>
         <artifactId>event-client</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-client-rabbitmq</artifactId>
diff --git a/pom.xml b/pom.xml
index a9d7899..a6b8f12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,14 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.aai.aai-common</groupId>
+        <artifactId>aai-parent</artifactId>
+        <version>1.6.5</version>
     </parent>
 
     <groupId>org.onap.aai.event-client</groupId>
     <artifactId>event-client</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.4-SNAPSHOT</version>
     <name>aai-event-client</name>
     <packaging>pom</packaging>
 
@@ -122,41 +122,6 @@
 	      <groupId>org.apache.maven.plugins</groupId>
 	      <artifactId>maven-deploy-plugin</artifactId>
 	    </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${jacoco.report.directory}/jacoco-ut.exec</dataFile>
-                            <rules>
-                                <!--  implementation is needed only for Maven 2  -->
-                                <rule
-                                    implementation="org.jacoco.maven.RuleConfiguration">
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit
-                                            implementation="org.jacoco.report.check.Limit">
-                                            <counter>LINE</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>${jacoco.line.coverage.limit}</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/version.properties b/version.properties
index a0756ad..fe64195 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=6
-patch=0
+patch=4
 
 base_version=${major}.${minor}.${patch}