Update dependency versions in pom

* Correct inconsistent use of aai-common version
* Align with ONAP version manifest:
  https://git.onap.org/integration/tree/version-manifest/
  src/main/resources/java-manifest.csv
* Organise for readability

Change-Id: Ie17625e0f1ad3773bcf950a937f5eed6367d4b1f
Issue-ID: AAI-1442
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>

2 files changed, 116 insertions, 102 deletions

diff --git a/.gitignore b/.gitignore
index 3615915..3b9de4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ target/
 
 # Misc
 .checkstyle
+.vscode/
 
diff --git a/pom.xml b/pom.xml
index a3ee5d1..f2ccb0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=========================================================
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -26,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
         <relativePath />
     </parent>
 
@@ -35,12 +34,9 @@ limitations under the License.
     <version>1.3.0-SNAPSHOT</version>
     <name>aai-gizmo</name>
 
-
     <properties>
         <docker.location>${basedir}/target</docker.location>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <testRouteOffer>workstation</testRouteOffer>
-        <testEnv>DEV</testEnv>
+        <version.org.onap.aai.aai-common>1.2.4</version.org.onap.aai.aai-common>
     </properties>
 
     <dependencyManagement>
@@ -85,9 +81,7 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>
-                    spring-boot-configuration-processor
-                </artifactId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -99,6 +93,92 @@ limitations under the License.
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
             <version>3.2.4</version>
         </dependency>
+
+        <!-- ONAP AAI-COMMON (incl. model) -->
+        <dependency>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-schema</artifactId>
+            <version>${version.org.onap.aai.aai-common}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-schema-ingest</artifactId>
+            <version>${version.org.onap.aai.aai-common}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-core</artifactId>
+            <version>${version.org.onap.aai.aai-common}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-utils</artifactId>
+            <version>${version.org.onap.aai.aai-common}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-auth</artifactId>
+            <version>${version.org.onap.aai.aai-common}</version>
+        </dependency>
+
+        <!-- ONAP EVENT CLIENT -->
+        <dependency>
+            <groupId>org.onap.aai.event-client</groupId>
+            <artifactId>event-client-dmaap</artifactId>
+            <version>1.2.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aai.event-client</groupId>
+            <artifactId>event-client-kafka</artifactId>
+            <version>1.2.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- ONAP COMMON LOGGING -->
+        <dependency>
+            <groupId>org.onap.aai.logging-service</groupId>
+            <artifactId>common-logging</artifactId>
+            <version>1.2.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- ONAP REST CLIENT -->
+        <dependency>
+            <groupId>org.onap.aai</groupId>
+            <artifactId>rest-client</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -114,7 +194,7 @@ limitations under the License.
                     <artifactId>logback-classic</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-access</artifactId>
@@ -136,18 +216,6 @@ limitations under the License.
             <version>1.4.5</version>
         </dependency>
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-library</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <version>1.6.1</version>
@@ -168,79 +236,12 @@ limitations under the License.
             <artifactId>gson</artifactId>
             <version>2.6.2</version>
         </dependency>
-        <!-- Common logging framework -->
-        <dependency>
-            <groupId>org.onap.aai.logging-service</groupId>
-            <artifactId>common-logging</artifactId>
-            <version>1.2.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.event-client</groupId>
-            <artifactId>event-client-dmaap</artifactId>
-            <version>1.2.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.aai-common</groupId>
-            <artifactId>aai-schema</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
-        </dependency>
-		<dependency>
-            <groupId>org.onap.aai.aai-common</groupId>
-            <artifactId>aai-schema-ingest</artifactId>
-            <version>1.2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.aai-common</groupId>
-            <artifactId>aai-utils</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.aai-common</groupId>
-            <artifactId>aai-core</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aai.aai-common</groupId>
-            <artifactId>aai-auth</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
             <version>2.6.2</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.aai</groupId>
-            <artifactId>rest-client</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
             <groupId>net.dongliu</groupId>
             <artifactId>gson-java8-datatype</artifactId>
             <version>1.0.3</version>
@@ -256,7 +257,6 @@ limitations under the License.
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- AAI-CORE specific dependencies -->
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-core</artifactId>
@@ -289,6 +289,18 @@ limitations under the License.
             <version>20160212</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.1</version>
+        </dependency>
+
+        <!-- TEST DEPENDENCIES -->
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
@@ -299,14 +311,16 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.1</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-library</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -421,7 +435,6 @@ limitations under the License.
                     </reportPlugins>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
@@ -441,7 +454,7 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
-			<plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -456,7 +469,7 @@ limitations under the License.
                                 <artifactItem>
                                     <groupId>org.onap.aai.aai-common</groupId>
                                     <artifactId>aai-schema</artifactId>
-                                    <version>1.2.1</version>
+                                    <version>${version.org.onap.aai.aai-common}</version>
                                     <type>jar</type>
                                     <includes>oxm/</includes>
                                     <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
@@ -464,7 +477,7 @@ limitations under the License.
                                 <artifactItem>
                                     <groupId>org.onap.aai.aai-common</groupId>
                                     <artifactId>aai-core</artifactId>
-                                    <version>1.2.1</version>
+                                    <version>${version.org.onap.aai.aai-common}</version>
                                     <type>jar</type>
                                     <includes>dbedgerules/</includes>
                                     <excludes>**/*.ftlh</excludes>