Merge "AaiController unit tests"

[vid.git] / vid-app-common / pom.xml

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 22911c2..205d642 100755 (executable)
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -14,14 +14,21 @@
     <name>VID Common</name>
     <description>VID Common code for opensource version</description>
 
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.2.3</version>
+        <relativePath/>
+    </parent>
+
     <properties>
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <epsdk.version>2.4.0</epsdk.version>
-        <springframework.version>4.2.9.RELEASE</springframework.version>
+        <springframework.version>4.3.22.RELEASE</springframework.version>
         <hibernate.version>4.3.11.Final</hibernate.version>
-        <jackson.version>2.9.7</jackson.version>
+        <jackson.version>2.9.8</jackson.version>
         <jersey.version>2.27</jersey.version>
         <surefire.version>2.22.1</surefire.version>
         <sonar.coverage.exclusions>**/webapp/**/*,**/*.js</sonar.coverage.exclusions>
@@ -337,6 +344,75 @@
                     </includeOnlyProperties>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <!--
+                Replace phase "none" with "process-sources" to enable.
+                Set organizationName as desired.
+                Then run `mvn license:check-file-header`, or even `mvn
+                license:update-file-header`.
+                -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <version>1.17</version>
+
+                <executions>
+                    <execution>
+                        <id>first</id>
+                        <goals>
+                            <goal>update-file-header</goal>
+                        </goals>
+                        <!-- replace phase "none" with "process-sources" to enable -->
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+
+                <configuration>
+                    <canUpdateCopyright>false</canUpdateCopyright>
+                    <canUpdateDescription>false</canUpdateDescription>
+                    <licenseName>apache_v2</licenseName>
+                    <processStartTag>============LICENSE_START=======================================================</processStartTag>
+                    <processEndTag>============LICENSE_END=========================================================</processEndTag>
+                    <sectionDelimiter>================================================================================</sectionDelimiter>
+                    <projectName>VID</projectName>
+                    <inceptionYear>2017</inceptionYear>
+                    <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
+                    <canUpdateLicense>true</canUpdateLicense>
+                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+                    <emptyLineAfterHeader>true</emptyLineAfterHeader>
+                    <verbose>false</verbose>
+
+                    <includes>
+                        <include>**/*.java</include>
+                        <include>**/*.kt</include>
+                        <include>**/*.jsp</include>
+                        <include>**/*.xml</include>
+                        <include>**/*.js</include>
+                        <include>**/*.ts</include>
+                        <include>**/*.html</include>
+                        <include>**/*.css</include>
+                        <include>**/*.sql</include>
+                    </includes>
+
+                    <extraExtensions>
+                        <sql>mysql</sql>
+                    </extraExtensions>
+
+                    <roots>
+                        <root>src/main</root>
+                        <root>src/test</root>
+                    </roots>
+
+                    <excludes>
+                        <exclude>**/app/vid/external/**/*</exclude>
+                        <exclude>**/main/webapp/WEB-INF/**/*</exclude>
+                        <exclude>**/test/resources/WEB-INF/**/*</exclude>
+                        <exclude>**/app/vid/scripts/angular-ui-tree.js</exclude>
+                    </excludes>
+
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 
@@ -379,7 +455,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -389,7 +464,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
-            <version>4.3.6</version>
+            <version>4.5.7</version>
         </dependency>
         <dependency>
             <groupId>com.xebialabs.restito</groupId>
@@ -397,6 +472,12 @@
             <version>0.9.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jeasy</groupId>
+            <artifactId>easy-random-core</artifactId>
+            <version>4.0.0.RC1</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Helpers -->
         <dependency>
@@ -451,15 +532,9 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.2.3</version>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
         </dependency>
 
         <dependency>
@@ -553,11 +628,8 @@
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.7.12</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
+
+        <!-- springframework to override epsdk-app-common's and epsdk-core's versions -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -589,6 +661,22 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${springframework.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
@@ -613,7 +701,6 @@
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.3</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -730,7 +817,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
         </dependency>
     </dependencies>
 </project>