X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=a3ee5d1b862735367a5fa364486d492be805ca90;hb=d8bd36e376d17c8d1fc13cc8b5ba00708c3b6673;hp=bcf3280c072090e24ddc00211cd15203fc8bf9de;hpb=6be781fcb9c9597f494c2bf9fa8ed4846e014138;p=aai%2Fgizmo.git

diff --git a/pom.xml b/pom.xml
index bcf3280..a3ee5d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,6 @@ limitations under the License.
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <testRouteOffer>workstation</testRouteOffer>
         <testEnv>DEV</testEnv>
-        <version.org.hamcrest.hamcrest-library>1.3</version.org.hamcrest.hamcrest-library>
     </properties>
 
     <dependencyManagement>
@@ -84,6 +83,17 @@ limitations under the License.
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>
+                    spring-boot-configuration-processor
+                </artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -127,9 +137,15 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <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>
@@ -187,6 +203,11 @@ limitations under the License.
             <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>
@@ -277,12 +298,6 @@ limitations under the License.
             <version>1.5.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>${version.org.hamcrest.hamcrest-library}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -293,13 +308,6 @@ limitations under the License.
             <artifactId>httpcore</artifactId>
             <version>4.4.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>
-                    spring-boot-configuration-processor
-                </artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
@@ -327,6 +335,13 @@ limitations under the License.
                                         <include>**/*</include>
                                     </includes>
                                 </resource>
+                                <resource>
+                                    <directory>${basedir}</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>bundleconfig-local/**</include>
+                                    </includes>
+                                </resource>
                                 <resource>
                                     <directory>${basedir}/src/main/bin/</directory>
                                 </resource>
@@ -340,6 +355,13 @@ limitations under the License.
                 <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>
@@ -363,12 +385,15 @@ limitations under the License.
                     <includes>
                         <include>src/main/java/**</include>
                         <include>src/test/java/**</include>
+                        <include>pom.xml</include>
                     </includes>
+                    <skipExistingHeaders>true</skipExistingHeaders>
                 </configuration>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>format</goal>
+                            <!-- Set goal from "check" to "format" to auto update license headers -->
+                            <goal>check</goal>
                         </goals>
                         <phase>process-sources</phase>
                     </execution>
@@ -415,6 +440,40 @@ limitations under the License.
                         </goals>
                     </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.1</version>
+                                    <type>jar</type>
+                                    <includes>oxm/</includes>
+                                    <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.aai.aai-common</groupId>
+                                    <artifactId>aai-core</artifactId>
+                                    <version>1.2.1</version>
+                                    <type>jar</type>
+                                    <includes>dbedgerules/</includes>
+                                    <excludes>**/*.ftlh</excludes>
+                                    <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>