X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=c66b855f940b76c0a87c24ada5f2148595afebb0;hb=9939a1d4a4d390cfb89829ad253d94f8f4102ac5;hp=738bb8d9ceb7fb9d2376d8c456744c4d235c24de;hpb=c27118c25252ac114b4464825e595f9310a642af;p=aai%2Fdata-router.git

diff --git a/pom.xml b/pom.xml
index 738bb8d..c66b855 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ limitations under the License.
    </parent>
    <groupId>org.onap.aai.data-router</groupId>
    <artifactId>data-router</artifactId>
-   <version>1.2.1-SNAPSHOT</version>
+   <version>1.3.0-SNAPSHOT</version>
    <name>aai-data-router</name>
 
    <properties>
@@ -67,6 +67,7 @@ limitations under the License.
       <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
       <sonar.projectVersion>${project.version}</sonar.projectVersion>
       <logback.version>1.2.3</logback.version>
+      <version.com.google.guava>16.0.1</version.com.google.guava>
    </properties>
 
    <dependencies>
@@ -165,12 +166,23 @@ limitations under the License.
       <dependency>
          <groupId>org.onap.aai.aai-common</groupId>
          <artifactId>aai-schema</artifactId>
-         <version>1.2.4</version>
+         <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>
+         <exclusions>
+             <exclusion>
+                 <groupId>com.google.guava</groupId>
+                 <artifactId>guava</artifactId>
+             </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.onap.aai.router-core</groupId>
          <artifactId>router-core</artifactId>
-         <version>1.2.0</version>
+         <version>1.3.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
@@ -208,7 +220,11 @@ limitations under the License.
          <version>1.1.0</version>
       </dependency>
 
-
+	  <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${version.com.google.guava}</version>
+      </dependency>
 
    </dependencies>
 
@@ -278,15 +294,54 @@ limitations under the License.
                               <include>**/*</include>
                            </includes>
                         </resource>
+                        <resource>
+                           <directory>${basedir}/config</directory>
+                           <filtering>true</filtering>
+                           <includes>
+                              <include>schema/**</include>
+                           </includes>
+                        </resource>
                      </resources>
                   </configuration>
                </execution>
             </executions>
          </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.onap.aai.aai-common</groupId>
+                      <artifactId>aai-schema</artifactId>
+                      <version>1.2.2</version>
+                      <type>jar</type>
+                      <includes>oxm/</includes>
+                      <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
          <plugin>
             <groupId>com.spotify</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <version>0.4.11</version>
+            <dependencies>
+                <dependency>
+                    <groupId>com.github.jnr</groupId>
+                    <artifactId>jnr-unixsocket</artifactId>
+                    <version>0.13</version>
+                </dependency>
+            </dependencies>
             <configuration>
                <verbose>true</verbose>
                <serverId>docker-hub</serverId>
@@ -300,11 +355,26 @@ limitations under the License.
          </plugin>
          <!-- license plugin -->
          <!-- Uncomment this to add a license header to every source file 
-            <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> 
-            <version>3.0</version> <configuration> <header>License.txt</header> <includes> 
-            <include>src/main/java/**</include> <include>src/test/java/**</include> </includes> 
-            </configuration> <executions> <execution> <goals> <goal>format</goal> </goals> 
-            <phase>process-sources</phase> </execution> </executions> </plugin> -->
+	<plugin>
+		<groupId>com.mycila</groupId>
+		<artifactId>license-maven-plugin</artifactId>
+		<version>3.0</version>
+		<configuration>
+			<header>License.txt</header>
+			<includes>
+				<include>src/main/java/**</include>
+				<include>src/test/java/**</include>
+			</includes>
+		</configuration>
+		<executions>
+			<execution>
+				<goals>
+					<goal>format</goal>
+				</goals>
+				<phase>process-sources</phase>
+			</execution>
+		</executions>
+	</plugin> -->
          <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -365,7 +435,7 @@ limitations under the License.
          <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5</version>
+            <version>4.5.5</version>
          </dependency>
          <dependency>
             <groupId>org.apache.httpcomponents</groupId>