align router code with 1.2.1 version of rest

[aai/data-router.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 20b6535..b3280ba 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@ limitations under the License.
       <installOwnerUser>aaiadmin</installOwnerUser>
       <installOwnerGroup>aaiadmin</installOwnerGroup>
       <ownerManagementGroup>com.att.csid.lab</ownerManagementGroup>
+      <version.aai-schema>1.4.1-SNAPSHOT</version.aai-schema>
 
       <!-- Port Selection. A value of 0 will allow for dynamic port selection.
          For local testing, you may choose to hardcode this value to something like
@@ -109,7 +110,6 @@ limitations under the License.
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
-
       </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
@@ -167,7 +167,7 @@ limitations under the License.
       <dependency>
          <groupId>com.att.aft</groupId>
          <artifactId>dme2</artifactId>
-         <version>3.1.200</version>
+         <version>3.1.200-oss</version>
          <scope>provided</scope>
       </dependency>
       <!--<dependency>-->
@@ -189,15 +189,10 @@ limitations under the License.
       <dependency>
          <groupId>org.onap.aai.router-core</groupId>
          <artifactId>router-core</artifactId>
-         <version>1.3.1</version>
+         <version>1.4.0-SNAPSHOT</version>
       </dependency>
 
-      <dependency>
-         <groupId>org.onap.aai.aai-common</groupId>
-         <artifactId>aai-schema-ingest</artifactId>
-         <version>1.3.0</version>
-      </dependency>
-      
+   
       <dependency>
          <groupId>org.json</groupId>
          <artifactId>json</artifactId>
@@ -230,7 +225,7 @@ limitations under the License.
       <dependency>
          <groupId>org.onap.aai</groupId>
          <artifactId>rest-client</artifactId>
-         <version>1.1.0</version>
+         <version>1.2.1</version>
       </dependency>
 
     <dependency>
@@ -337,6 +332,18 @@ limitations under the License.
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-maven-plugin</artifactId>
          </plugin>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.21.0</version>
+            <configuration>
+                <systemPropertyVariables>
+                    <APP_HOME>${project.basedir}</APP_HOME>
+                    <CONFIG_HOME>${project.basedir}/src/test/resources/config</CONFIG_HOME>
+                    <SERVICE_BEANS>${project.basedir}/src/test/resources/spring-beans</SERVICE_BEANS>
+                    <testShemaUnpackVersion>${shemaUnpackVersion}</testShemaUnpackVersion>
+                </systemPropertyVariables>
+            </configuration>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
@@ -391,7 +398,7 @@ limitations under the License.
             <executions>
               <execution>
                 <id>unpack</id>
-                <phase>prepare-package</phase>
+                <phase>initialize</phase>
                 <goals>
                   <goal>unpack</goal>
                 </goals>
@@ -400,7 +407,7 @@ limitations under the License.
                     <artifactItem>
                       <groupId>org.onap.aai.aai-common</groupId>
                       <artifactId>aai-schema</artifactId>
-                      <version>1.3.0</version>
+                      <version>${version.aai-schema}</version>
                       <type>jar</type>
                       <includes>/${shemaUnpackVersion}/oxm/</includes>
                       <outputDirectory>${project.build.directory}/oxm</outputDirectory>