X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=a3ee5d1b862735367a5fa364486d492be805ca90;hb=194adee686ebb90488f739f2c637f6cb3def94d5;hp=22769391547eb449ae70952fdc8d2e6aae0e05dc;hpb=28f9fa1399f5e513a3d5860c52cd51b615bc0a2c;p=aai%2Fgizmo.git

diff --git a/pom.xml b/pom.xml
index 2276939..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>
@@ -288,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>
@@ -304,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>
@@ -388,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>
@@ -461,6 +461,15 @@ limitations under the License.
                                     <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>