Modified DB Upgrade script for OptimizationModels

Changed the incorrect column 'dataorder' to 'dataorderinfo'

Made changes to pom and AAF client code per AAF API changes in new
depedency.

Change-Id: Ic9bf0edec8282cc0f96d6fedd62fa9253d52070f
Issue-ID: POLICY-731
Signed-off-by: Michael Mokry <mm117s@att.com>
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 9ae92ca..e9662d8 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -97,9 +97,9 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-  			<groupId>org.onap.aaf.cadi</groupId>
-  			<artifactId>cadi-aaf</artifactId>
-  			<version>1.0.0</version>
+		  	<groupId>org.onap.aaf.authz</groupId>
+		  	<artifactId>aaf-cadi-aaf</artifactId>
+		  	<version>2.1.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.google.code.gson</groupId>